From 17288f3d043eddc62ba63b1ca72dd6f78aa89161 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Mon, 23 May 2022 23:17:28 +0300 Subject: [PATCH] Log startup errors and only try to start users who have a token --- database/userquery.go | 2 +- user.go | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/database/userquery.go b/database/userquery.go index 8d67145..25b1a84 100644 --- a/database/userquery.go +++ b/database/userquery.go @@ -38,7 +38,7 @@ func (uq *UserQuery) GetByID(id string) *User { } func (uq *UserQuery) GetAll() []*User { - rows, err := uq.db.Query(`SELECT mxid, id, management_room, token FROM "user"`) + rows, err := uq.db.Query(`SELECT mxid, id, management_room, token FROM "user" WHERE token IS NOT NULL`) if err != nil || rows == nil { return nil } diff --git a/user.go b/user.go index 3ca88f5..f8b2b5a 100644 --- a/user.go +++ b/user.go @@ -182,8 +182,13 @@ func (br *DiscordBridge) getAllUsers() []*User { func (br *DiscordBridge) startUsers() { br.Log.Debugln("Starting users") - for _, user := range br.getAllUsers() { - go user.Connect() + for _, u := range br.getAllUsers() { + go func(user *User) { + err := user.Connect() + if err != nil { + user.log.Errorfln("Error connecting: %v", err) + } + }(u) } br.Log.Debugln("Starting custom puppets")