Changeset 644 in code for trunk

Timestamp:

Oct 15, 2021, 4:11:04 PM (4 years ago)

Author:

contact

Message:

msgstore_fs: rename log dir when network is renamed

Location:

trunk

Files:

• msgstore_fs.go (modified) (1 diff)
• user.go (modified) (1 diff)

trunk/msgstore_fs.go

@@ -554 +554 @@
 }
 
+func (ms *fsMessageStore) RenameNetwork(oldNet, newNet *network) error {
+        oldDir := filepath.Join(ms.root, escapeFilename(oldNet.GetName()))
+        newDir := filepath.Join(ms.root, escapeFilename(newNet.GetName()))
+        // Avoid loosing data by overwriting an existing directory
+        if _, err := os.Stat(newDir); err == nil {
+                return fmt.Errorf("destination %q already exists", newDir)
+        }
+        return os.Rename(oldDir, newDir)
+}
+
 func truncateDay(t time.Time) time.Time {
         year, month, day := t.Date()

trunk/user.go

@@ -855 +855 @@
         u.removeNetwork(network)
 
+        // The filesystem message store needs to be notified whenever the network
+        // is renamed
+        fsMsgStore, isFS := u.msgStore.(*fsMessageStore)
+        if isFS && updatedNetwork.GetName() != network.GetName() {
+                if err := fsMsgStore.RenameNetwork(network, updatedNetwork); err != nil {
+                        network.logger.Printf("failed to update FS message store network name to %q: %v", updatedNetwork.GetName(), err)
+                }
+        }
+
         // This will re-connect to the upstream server
         u.addNetwork(updatedNetwork)