Changeset 215 in code for trunk

Timestamp:

Apr 3, 2020, 4:59:17 PM (5 years ago)

Author:

contact

Message:

Introduce messageLogger

This centralizes formatting related to message logging in a single
place.

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• logger.go (added)
• upstream.go (modified) (14 diffs)
• user.go (modified) (1 diff)

trunk/downstream.go

@@ -1233 +1233 @@
                         dc.lock.Unlock()
 
-                        uc.appendLog(upstreamName, "<%s> %s", uc.nick, text)
+                        uc.appendLog(upstreamName, echoMsg)
 
                         uc.network.ring.Produce(echoMsg)

trunk/upstream.go

@@ -9 +9 @@
         "net"
         "os"
-        "path/filepath"
         "strconv"
         "strings"
@@ -63 +62 @@
         pendingLISTDownstreamSet map[uint64]struct{}
 
-        logs map[string]entityLog
+        messageLoggers map[string]*messageLogger
 }
 
@@ -98 +97 @@
                 availableMemberships:     stdMemberships,
                 pendingLISTDownstreamSet: make(map[uint64]struct{}),
-                logs:                     make(map[string]entityLog),
+                messageLoggers:           make(map[string]*messageLogger),
         }
 
@@ -274 +273 @@
                                 target = msg.Prefix.Name
                         }
-                        uc.appendLog(target, "<%s> %s", msg.Prefix.Name, text)
+                        uc.appendLog(target, msg)
 
                         uc.forEachDownstream(func(dc *downstreamConn) {
@@ -579 +578 @@
                                 delete(ch.Members, msg.Prefix.Name)
                                 ch.Members[newNick] = membership
-                                uc.appendLog(ch.Name, "*** %s is now known as %s", msg.Prefix.Name, newNick)
+                                uc.appendLog(ch.Name, msg)
                         }
                 }
@@ -623 +622 @@
                         }
 
-                        uc.appendLog(ch, "*** Joins: %s (%s@%s)", msg.Prefix.Name, msg.Prefix.User, msg.Prefix.Host)
+                        uc.appendLog(ch, msg)
 
                         uc.forEachDownstream(func(dc *downstreamConn) {
@@ -660 +659 @@
                         }
 
-                        uc.appendLog(ch, "*** Parts: %s (%s@%s) (%s)", msg.Prefix.Name, msg.Prefix.User, msg.Prefix.Host, reason)
+                        uc.appendLog(ch, msg)
 
                         uc.forEachDownstream(func(dc *downstreamConn) {
+                                params := []string{dc.marshalChannel(uc, ch)}
+                                if reason != "" {
+                                        params = append(params, reason)
+                                }
                                 dc.SendMessage(&irc.Message{
                                         Prefix:  dc.marshalUserPrefix(uc, msg.Prefix),
                                         Command: "PART",
-                                        Params:  []string{dc.marshalChannel(uc, ch)},
+                                        Params:  params,
                                 })
                         })
@@ -682 +685 @@
                 var reason string
                 if len(msg.Params) > 2 {
-                        reason = msg.Params[1]
+                        reason = msg.Params[2]
                 }
 
@@ -696 +699 @@
                 }
 
-                uc.appendLog(channel, "*** %s was kicked by %s (%s)", user, msg.Prefix.Name, reason)
+                uc.appendLog(channel, msg)
 
                 uc.forEachDownstream(func(dc *downstreamConn) {
@@ -714 +717 @@
                 }
 
-                var reason string
-                if len(msg.Params) > 0 {
-                        reason = msg.Params[0]
-                }
-
                 if msg.Prefix.Name == uc.nick {
                         uc.logger.Printf("quit")
@@ -727 +725 @@
                                 delete(ch.Members, msg.Prefix.Name)
 
-                                uc.appendLog(ch.Name, "*** Quits: %s (%s@%s) (%s)", msg.Prefix.Name, msg.Prefix.User, msg.Prefix.Host, reason)
+                                uc.appendLog(ch.Name, msg)
                         }
                 }
@@ -803 +801 @@
                         }
 
-                        modeMsg := modeStr
-                        for _, v := range msg.Params[2:] {
-                                modeMsg += " " + v
-                        }
-                        uc.appendLog(ch.Name, "*** %s sets mode: %s", msg.Prefix.Name, modeMsg)
+                        uc.appendLog(ch.Name, msg)
 
                         uc.forEachDownstream(func(dc *downstreamConn) {
@@ -1164 +1158 @@
                         target = msg.Prefix.Name
                 }
-                uc.appendLog(target, "<%s> %s", msg.Prefix.Name, text)
+                uc.appendLog(target, msg)
 
                 uc.network.ring.Produce(msg)
@@ -1378 +1372 @@
 
 // TODO: handle moving logs when a network name changes, when support for this is added
-func (uc *upstreamConn) appendLog(entity string, format string, a ...interface{}) {
+func (uc *upstreamConn) appendLog(entity string, msg *irc.Message) {
         if uc.srv.LogPath == "" {
                 return
         }
-        // TODO: enforce maximum open file handles (LRU cache of file handles)
-        // TODO: handle non-monotonic clock behaviour
-        now := time.Now()
-        year, month, day := now.Date()
-        name := fmt.Sprintf("%04d-%02d-%02d.log", year, month, day)
-        log, ok := uc.logs[entity]
-        if !ok || log.name != name {
-                if ok {
-                        log.file.Close()
-                        delete(uc.logs, entity)
-                }
-                // TODO: handle/forbid network/entity names with illegal path characters
-                dir := filepath.Join(uc.srv.LogPath, uc.user.Username, uc.network.Name, entity)
-                if err := os.MkdirAll(dir, 0700); err != nil {
-                        uc.logger.Printf("failed to log message: could not create logs directory %q: %v", dir, err)
-                        return
-                }
-                path := filepath.Join(dir, name)
-                f, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0600)
-                if err != nil {
-                        uc.logger.Printf("failed to log message: could not open or create log file %q: %v", path, err)
-                        return
-                }
-                log = entityLog{
-                        name: name,
-                        file: f,
-                }
-                uc.logs[entity] = log
-        }
-
-        format = "[%02d:%02d:%02d] " + format + "\n"
-        args := []interface{}{now.Hour(), now.Minute(), now.Second()}
-        args = append(args, a...)
-
-        if _, err := fmt.Fprintf(log.file, format, args...); err != nil {
-                uc.logger.Printf("failed to log message to %q: %v", log.name, err)
+
+        ml, ok := uc.messageLoggers[entity]
+        if !ok {
+                ml = newMessageLogger(uc, entity)
+                uc.messageLoggers[entity] = ml
+        }
+
+        if err := ml.Append(msg); err != nil {
+                uc.logger.Printf("failed to log message: %v", err)
         }
 }

trunk/user.go

@@ -208 +208 @@
                         uc.network.lock.Unlock()
 
-                        for _, log := range uc.logs {
-                                log.file.Close()
+                        for _, ml := range uc.messageLoggers {
+                                if err := ml.Close(); err != nil {
+                                        uc.logger.Printf("failed to close message logger: %v", err)
+                                }
                         }