Changeset 222 in code for trunk

Timestamp:

Apr 5, 2020, 1:04:52 PM (5 years ago)

Author:

contact

Message:

Add network.{createUpdate,delete}Channel

These are about to get more complicated as we move towards per-entity
ring buffers.

Location:

trunk

Files:

• downstream.go (modified) (2 diffs)
• user.go (modified) (1 diff)

trunk/downstream.go

@@ -828 +828 @@
                         })
 
-                        ch, err := dc.srv.db.GetChannel(uc.network.ID, upstreamName)
-                        if err == ErrNoSuchChannel {
-                                ch = &Channel{Name: upstreamName}
-                        } else if err != nil {
-                                return err
-                        }
-
-                        ch.Key = key
-
-                        if err := dc.srv.db.StoreChannel(uc.network.ID, ch); err != nil {
-                                return err
+                        ch := &Channel{Name: upstreamName, Key: key}
+                        if err := uc.network.createUpdateChannel(ch); err != nil {
+                                dc.logger.Printf("failed to create or update channel %q: %v", upstreamName, err)
                         }
                 }
@@ -867 +859 @@
                         })
 
-                        if err := dc.srv.db.DeleteChannel(uc.network.ID, upstreamName); err != nil {
-                                dc.logger.Printf("failed to delete channel %q in DB: %v", upstreamName, err)
+                        if err := uc.network.deleteChannel(upstreamName); err != nil {
+                                dc.logger.Printf("failed to delete channel %q: %v", upstreamName, err)
                         }
                 }

trunk/user.go

@@ -138 +138 @@
                 uc.Close()
         }
+}
+
+func (net *network) createUpdateChannel(ch *Channel) error {
+        if dbCh, err := net.user.srv.db.GetChannel(net.ID, ch.Name); err == nil {
+                ch.ID = dbCh.ID
+        } else if err != ErrNoSuchChannel {
+                return err
+        }
+        return net.user.srv.db.StoreChannel(net.ID, ch)
+}
+
+func (net *network) deleteChannel(name string) error {
+        return net.user.srv.db.DeleteChannel(net.ID, name)
 }