Changeset 21 in code for trunk/upstream.go

Timestamp:

Feb 6, 2020, 7:26:03 PM (5 years ago)

Author:

contact

Message:

Add per-upstream logger

File:

• trunk/upstream.go (modified) (7 diffs)

trunk/upstream.go

@@ -24 +24 @@
 type upstreamConn struct {
         upstream *Upstream
+        logger   Logger
         net      net.Conn
         irc      *irc.Conn
@@ -63 +64 @@
                 return c.modes.Apply(msg.Params[1])
         case "NOTICE":
-                c.srv.Logger.Printf("%q: %v", c.upstream.Addr, msg)
+                c.logger.Print(msg)
         case irc.RPL_WELCOME:
                 c.registered = true
-                c.srv.Logger.Printf("Connection to %q registered", c.upstream.Addr)
+                c.logger.Printf("connection registered")
 
                 for _, ch := range c.upstream.Channels {
@@ -92 +93 @@
                 }
                 for _, ch := range strings.Split(msg.Params[0], ",") {
-                        c.srv.Logger.Printf("Joined channel %q", ch)
+                        c.logger.Printf("joined channel %q", ch)
                         c.channels[ch] = &upstreamChannel{
                                 Name:    ch,
@@ -170 +171 @@
                 // Ignore
         default:
-                c.srv.Logger.Printf("Unhandled upstream message: %v", msg)
+                c.logger.Printf("unhandled upstream message: %v", msg)
         }
         return nil
@@ -176 +177 @@
 
 func connect(s *Server, upstream *Upstream) error {
-        s.Logger.Printf("Connecting to %v", upstream.Addr)
+        logger := &prefixLogger{s.Logger, fmt.Sprintf("upstream %q: ", upstream.Addr)}
+        logger.Printf("connecting to server")
 
         netConn, err := tls.Dial("tcp", upstream.Addr, nil)
@@ -185 +187 @@
         c := upstreamConn{
                 upstream: upstream,
+                logger:   logger,
                 net:      netConn,
                 irc:      irc.NewConn(netConn),
@@ -217 +220 @@
 
                 if err := c.handleMessage(msg); err != nil {
-                        c.srv.Logger.Printf("Failed to handle message %q from %q: %v", msg, upstream.Addr, err)
+                        c.logger.Printf("failed to handle message %q: %v", msg, err)
                 }
         }