Changeset 247 in code for trunk

Timestamp:

Apr 7, 2020, 7:50:12 PM (5 years ago)

Author:

contact

Message:

Extract logic to build log filepath into a function

This will get re-used when parsing logs.

File:

• trunk/logger.go (modified) (5 diffs)

trunk/logger.go

@@ -15 +15 @@
         entity string
 
-        filename string
-        file     *os.File
+        path string
+        file *os.File
 }
 
@@ -24 +24 @@
                 entity: entity,
         }
+}
+
+func logPath(network *network, entity string, t time.Time) string {
+        user := network.user
+        srv := user.srv
+
+        // TODO: handle/forbid network/entity names with illegal path characters
+        year, month, day := t.Date()
+        filename := fmt.Sprintf("%04d-%02d-%02d.log", year, month, day)
+        return filepath.Join(srv.LogPath, user.Username, network.GetName(), entity, filename)
 }
 
@@ -37 +47 @@
         // TODO: handle non-monotonic clock behaviour
         now := time.Now()
-        year, month, day := now.Date()
-        filename := fmt.Sprintf("%04d-%02d-%02d.log", year, month, day)
-        if ml.filename != filename {
+        path := logPath(ml.conn.network, ml.entity, now)
+        if ml.path != path {
                 if ml.file != nil {
                         ml.file.Close()
                 }
 
-                // TODO: handle/forbid network/entity names with illegal path characters
-                dir := filepath.Join(ml.conn.srv.LogPath, ml.conn.user.Username, ml.conn.network.GetName(), ml.entity)
+                dir := filepath.Dir(path)
                 if err := os.MkdirAll(dir, 0700); err != nil {
                         return fmt.Errorf("failed to create logs directory %q: %v", dir, err)
                 }
 
-                path := filepath.Join(dir, filename)
                 f, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0600)
                 if err != nil {
@@ -56 +63 @@
                 }
 
-                ml.filename = filename
+                ml.path = path
                 ml.file = f
         }
@@ -62 +69 @@
         _, err := fmt.Fprintf(ml.file, "[%02d:%02d:%02d] %s\n", now.Hour(), now.Minute(), now.Second(), s)
         if err != nil {
-                return fmt.Errorf("failed to log message to %q: %v", ml.filename, err)
+                return fmt.Errorf("failed to log message to %q: %v", ml.path, err)
         }
         return nil