Changeset 652 in code for trunk/contrib

Timestamp:

Oct 18, 2021, 5:15:15 PM (4 years ago)

Author:

contact

Message:

Add context args to Database interface

This is a mecanical change, which just lifts up the context.TODO()
calls from inside the DB implementations to the callers.

Future work involves properly wiring up the contexts when it makes
sense.

File:

• trunk/contrib/znc-import.go (modified) (5 diffs)

trunk/contrib/znc-import.go

@@ -3 +3 @@
 import (
         "bufio"
+        "context"
         "flag"
         "fmt"
@@ -80 +81 @@
         }
 
-        l, err := db.ListUsers()
+        l, err := db.ListUsers(context.TODO())
         if err != nil {
                 log.Fatalf("failed to list users in DB: %v", err)
@@ -112 +113 @@
                 u.Admin = section.Values.Get("Admin") == "true"
 
-                if err := db.StoreUser(u); err != nil {
+                if err := db.StoreUser(context.TODO(), u); err != nil {
                         log.Fatalf("failed to store user %q: %v", username, err)
                 }
                 userID := u.ID
 
-                l, err := db.ListNetworks(userID)
+                l, err := db.ListNetworks(context.TODO(), userID)
                 if err != nil {
                         log.Fatalf("failed to list networks for user %q: %v", username, err)
@@ -184 +185 @@
                         n.Enabled = section.Values.Get("IRCConnectEnabled") != "false"
 
-                        if err := db.StoreNetwork(userID, n); err != nil {
+                        if err := db.StoreNetwork(context.TODO(), userID, n); err != nil {
                                 logger.Fatalf("failed to store network: %v", err)
                         }
 
-                        l, err := db.ListChannels(n.ID)
+                        l, err := db.ListChannels(context.TODO(), n.ID)
                         if err != nil {
                                 logger.Fatalf("failed to list channels: %v", err)
@@ -218 +219 @@
                                 ch.Detached = section.Values.Get("Detached") == "true"
 
-                                if err := db.StoreChannel(n.ID, ch); err != nil {
+                                if err := db.StoreChannel(context.TODO(), n.ID, ch); err != nil {
                                         logger.Printf("channel %q: failed to store channel: %v", chName, err)
                                 }