sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

contrib/znc-import: use background context

Browse Source
This commit is contained in:
Simon Ser 2021-11-17 11:56:16 +01:00
parent 0c5aa8cbff
commit 7160713ea9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/znc-import.go
View File

@ -62,6 +62,8 @@ func main() {
cfg = config.Defaults() cfg = config.Defaults()
} }
ctx := context.Background()
db, err := soju.OpenDB(cfg.SQLDriver, cfg.SQLSource) db, err := soju.OpenDB(cfg.SQLDriver, cfg.SQLSource)
if err != nil { if err != nil {
log.Fatalf("failed to open database: %v", err) log.Fatalf("failed to open database: %v", err)
@ -80,7 +82,7 @@ func main() {
log.Fatalf("failed to parse %q: line %v: %v", zncPath, zp.line, err) log.Fatalf("failed to parse %q: line %v: %v", zncPath, zp.line, err)
} }
l, err := db.ListUsers(context.TODO()) l, err := db.ListUsers(ctx)
if err != nil { if err != nil {
log.Fatalf("failed to list users in DB: %v", err) log.Fatalf("failed to list users in DB: %v", err)
} }
@ -112,12 +114,12 @@ func main() {
u.Admin = section.Values.Get("Admin") == "true" u.Admin = section.Values.Get("Admin") == "true"
if err := db.StoreUser(context.TODO(), u); err != nil { if err := db.StoreUser(ctx, u); err != nil {
log.Fatalf("failed to store user %q: %v", username, err) log.Fatalf("failed to store user %q: %v", username, err)
} }
userID := u.ID userID := u.ID
l, err := db.ListNetworks(context.TODO(), userID) l, err := db.ListNetworks(ctx, userID)
if err != nil { if err != nil {
log.Fatalf("failed to list networks for user %q: %v", username, err) log.Fatalf("failed to list networks for user %q: %v", username, err)
} }
@ -184,11 +186,11 @@ func main() {
n.Pass = pass n.Pass = pass
n.Enabled = section.Values.Get("IRCConnectEnabled") != "false" n.Enabled = section.Values.Get("IRCConnectEnabled") != "false"
if err := db.StoreNetwork(context.TODO(), userID, n); err != nil { if err := db.StoreNetwork(ctx, userID, n); err != nil {
logger.Fatalf("failed to store network: %v", err) logger.Fatalf("failed to store network: %v", err)
} }
l, err := db.ListChannels(context.TODO(), n.ID) l, err := db.ListChannels(ctx, n.ID)
if err != nil { if err != nil {
logger.Fatalf("failed to list channels: %v", err) logger.Fatalf("failed to list channels: %v", err)
} }
@ -218,7 +220,7 @@ func main() {
ch.Key = section.Values.Get("Key") ch.Key = section.Values.Get("Key")
ch.Detached = section.Values.Get("Detached") == "true" ch.Detached = section.Values.Get("Detached") == "true"
if err := db.StoreChannel(context.TODO(), n.ID, ch); err != nil { if err := db.StoreChannel(ctx, n.ID, ch); err != nil {
logger.Printf("channel %q: failed to store channel: %v", chName, err) logger.Printf("channel %q: failed to store channel: %v", chName, err)
} }
}) })