Changeset 202 in code for trunk

Timestamp:

Apr 1, 2020, 1:40:20 PM (5 years ago)

Author:

contact

Message:

Add "network delete" service command

And add all the infrastructure required to stop and delete networks.

References: ​https://todo.sr.ht/~emersion/soju/17

Location:

trunk

Files:

• db.go (modified) (1 diff)
• service.go (modified) (4 diffs)
• user.go (modified) (5 diffs)

trunk/db.go

@@ -216 +216 @@
 }
 
+func (db *DB) DeleteNetwork(id int64) error {
+        db.lock.Lock()
+        defer db.lock.Unlock()
+
+        tx, err := db.db.Begin()
+        if err != nil {
+                return err
+        }
+        defer tx.Rollback()
+
+        _, err = tx.Exec("DELETE FROM Network WHERE id = ?", id)
+        if err != nil {
+                return err
+        }
+
+        _, err = tx.Exec("DELETE FROM Channel WHERE network = ?", id)
+        if err != nil {
+                return err
+        }
+
+        return tx.Commit()
+}
+
 func (db *DB) ListChannels(networkID int64) ([]Channel, error) {
         db.lock.RLock()

trunk/service.go

@@ -98 +98 @@
                                         handle: handleServiceNetworkStatus,
                                 },
+                                "delete": {
+                                        usage:  "<name>",
+                                        desc:   "delete a network",
+                                        handle: handleServiceNetworkDelete,
+                                },
                         },
                 },
@@ -144 +149 @@
 }
 
-func handleServiceCreateNetwork(dc *downstreamConn, params []string) error {
+func newFlagSet() *flag.FlagSet {
         fs := flag.NewFlagSet("", flag.ContinueOnError)
         fs.SetOutput(ioutil.Discard)
+        return fs
+}
+
+func handleServiceCreateNetwork(dc *downstreamConn, params []string) error {
+        fs := newFlagSet()
         addr := fs.String("addr", "", "")
         name := fs.String("name", "", "")
@@ -178 +188 @@
         }
 
-        sendServicePRIVMSG(dc, fmt.Sprintf("created network %s successfully", network.GetName()))
+        sendServicePRIVMSG(dc, fmt.Sprintf("created network %q", network.GetName()))
         return nil
 }
@@ -205 +215 @@
         return nil
 }
+
+func handleServiceNetworkDelete(dc *downstreamConn, params []string) error {
+        if len(params) != 1 {
+                return fmt.Errorf("expected exactly one argument")
+        }
+
+        net := dc.user.getNetwork(params[0])
+        if net == nil {
+                return fmt.Errorf("unknown network %q", params[0])
+        }
+
+        if err := dc.user.deleteNetwork(net.ID); err != nil {
+                return err
+        }
+
+        sendServicePRIVMSG(dc, fmt.Sprintf("deleted network %q", net.GetName()))
+        return nil
+}

trunk/user.go

@@ -38 +38 @@
 type network struct {
         Network
-        user *user
-        ring *Ring
+        user    *user
+        ring    *Ring
+        stopped chan struct{}
 
         lock    sync.Mutex
@@ -51 +52 @@
                 user:    user,
                 ring:    NewRing(user.srv.RingCap),
+                stopped: make(chan struct{}),
                 history: make(map[string]uint64),
         }
@@ -58 +60 @@
         var lastTry time.Time
         for {
+                select {
+                case <-net.stopped:
+                        return
+                default:
+                        // This space is intentionally left blank
+                }
+
                 if dur := time.Now().Sub(lastTry); dur < retryConnectMinDelay {
                         delay := retryConnectMinDelay - dur
@@ -91 +100 @@
         defer net.lock.Unlock()
         return net.conn
+}
+
+func (net *network) Stop() {
+        select {
+        case <-net.stopped:
+                return
+        default:
+                close(net.stopped)
+        }
+
+        if uc := net.upstream(); uc != nil {
+                uc.Close()
+        }
 }
 
@@ -266 +288 @@
         return network, nil
 }
+
+func (u *user) deleteNetwork(id int64) error {
+        for i, net := range u.networks {
+                if net.ID != id {
+                        continue
+                }
+
+                if err := u.srv.db.DeleteNetwork(net.ID); err != nil {
+                        return err
+                }
+
+                u.forEachDownstream(func(dc *downstreamConn) {
+                        if dc.network != nil && dc.network == net {
+                                dc.Close()
+                        }
+                })
+
+                net.Stop()
+                u.networks = append(u.networks[:i], u.networks[i+1:]...)
+                return nil
+        }
+
+        panic("tried deleting a non-existing network")
+}