From f8ca9355d276a45512927c68dbe9152f0a86e640 Mon Sep 17 00:00:00 2001 From: fumiama Date: Sat, 27 Nov 2021 00:56:22 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20=20=E4=BF=AE=E5=A4=8D=20co?= =?UTF-8?q?ntrol=20=E5=85=A8=E5=B1=80=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- control/rule.go | 1 - utils/sql/sqlite.go | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/control/rule.go b/control/rule.go index 0edd6d1f..cbdfae11 100644 --- a/control/rule.go +++ b/control/rule.go @@ -94,7 +94,6 @@ func (m *Control) IsEnabledIn(gid int64) bool { m.RLock() err = db.Find(m.service, &c, "WHERE gid = "+strconv.FormatInt(gid, 10)) m.RUnlock() - logrus.Debugln("[control] db find gid =", c.GroupID) if err == nil && gid == c.GroupID { logrus.Debugf("[control] plugin %s of grp %d : %d", m.service, c.GroupID, c.Disable) return c.Disable == 0 diff --git a/utils/sql/sqlite.go b/utils/sql/sqlite.go index b0b79d84..54746484 100644 --- a/utils/sql/sqlite.go +++ b/utils/sql/sqlite.go @@ -133,17 +133,14 @@ func (db *Sqlite) Find(table string, objptr interface{}, condition string) error if !rows.Next() { return errors.New("sql.Find: null result") } - + err = rows.Scan(addrs(objptr)...) for rows.Next() { if err != nil { return err } err = rows.Scan(addrs(objptr)...) - if err != nil { - return err - } } - return nil + return err } // ListTables 列出所有表名