Changeset 733 in code for trunk

Timestamp:

Dec 2, 2021, 10:03:56 AM (4 years ago)

Author:

contact

Message:

Fix upstream gauge metric

It wasn't decremented on error. While at it, increment it when
connecting to the upstream network.

File:

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

trunk/user.go

@@ -203 +203 @@
                 lastTry = time.Now()
 
+                net.user.srv.metrics.upstreams.Add(1)
+
                 uc, err := connectToUpstream(context.TODO(), net)
                 if err != nil {
                         net.logger.Printf("failed to connect to upstream server %q: %v", net.Addr, err)
                         net.user.events <- eventUpstreamConnectionError{net, fmt.Errorf("failed to connect: %v", err)}
+                        net.user.srv.metrics.upstreams.Add(-1)
                         continue
                 }
@@ -213 +216 @@
                         net.user.srv.Identd.Store(uc.RemoteAddr().String(), uc.LocalAddr().String(), userIdent(&net.user.User))
                 }
-
-                net.user.srv.metrics.upstreams.Add(1)
 
                 uc.register()
@@ -225 +226 @@
                         net.user.events <- eventUpstreamConnectionError{net, fmt.Errorf("failed to register: %v", text)}
                         uc.Close()
+                        net.user.srv.metrics.upstreams.Add(-1)
                         continue
                 }