✏️ 修复 control 全局禁用

starim00 · Nov 26, 2021 · f8ca935 · f8ca935
1 parent d4bceb1
commit f8ca935
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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 列出所有表名