Changeset 65 in code for trunk

Timestamp:

Feb 18, 2020, 3:54:06 PM (5 years ago)

Author:

contact

Message:

Don't leave connections half-opened

File:

• trunk/server.go (modified) (3 diffs)

trunk/server.go

@@ -135 +135 @@
                 // TODO: retry connecting
                 go func() {
-                        conn, err := connectToUpstream(u, upstream)
+                        uc, err := connectToUpstream(u, upstream)
                         if err != nil {
                                 s.Logger.Printf("failed to connect to upstream server %q: %v", upstream.Addr, err)
@@ -141 +141 @@
                         }
 
-                        conn.register()
+                        uc.register()
 
                         u.lock.Lock()
-                        u.upstreamConns = append(u.upstreamConns, conn)
+                        u.upstreamConns = append(u.upstreamConns, uc)
                         u.lock.Unlock()
 
-                        if err := conn.readMessages(); err != nil {
-                                conn.logger.Printf("failed to handle messages: %v", err)
-                        }
+                        if err := uc.readMessages(); err != nil {
+                                uc.logger.Printf("failed to handle messages: %v", err)
+                        }
+                        uc.Close()
 
                         u.lock.Lock()
-                        for i, c := range u.upstreamConns {
-                                if c == conn {
+                        for i := range u.upstreamConns {
+                                if u.upstreamConns[i] == uc {
                                         u.upstreamConns = append(u.upstreamConns[:i], u.upstreamConns[i+1:]...)
                                         break
@@ -177 +178 @@
                 }
 
-                conn := newDownstreamConn(s, netConn)
+                dc := newDownstreamConn(s, netConn)
                 go func() {
                         s.lock.Lock()
-                        s.downstreamConns = append(s.downstreamConns, conn)
+                        s.downstreamConns = append(s.downstreamConns, dc)
                         s.lock.Unlock()
 
-                        if err := conn.readMessages(); err != nil {
-                                conn.logger.Printf("failed to handle messages: %v", err)
-                        }
+                        if err := dc.readMessages(); err != nil {
+                                dc.logger.Printf("failed to handle messages: %v", err)
+                        }
+                        dc.Close()
 
                         s.lock.Lock()
-                        for i, c := range s.downstreamConns {
-                                if c == conn {
+                        for i := range s.downstreamConns {
+                                if s.downstreamConns[i] == dc {
                                         s.downstreamConns = append(s.downstreamConns[:i], s.downstreamConns[i+1:]...)
                                         break