✏️ 修复 manager 定时器错误

Author: fumiama

plugin_manager/timer/timer.go

@@ -78,15 +78,19 @@ func (c *Clock) RegisterTimer(ts *Timer, save bool) bool {
 			c.entries[key] = eid
 			c.entmu.Unlock()
 			if save {
-				err = c.AddTimer(ts)
+				err = c.AddTimerIntoDB(ts)
+			}
+			if err == nil {
+				err = c.AddTimerIntoMap(ts)
 			}
 			return err == nil
 		}
 		ts.Alert = err.Error()
 	} else {
 		if save {
-			_ = c.AddTimer(ts)
+			_ = c.AddTimerIntoDB(ts)
 		}
+		_ = c.AddTimerIntoMap(ts)
 		for ts.En() {
 			nextdate := ts.nextWakeTime()
 			sleepsec := time.Until(nextdate)
@@ -161,15 +165,22 @@ func (c *Clock) GetTimer(key uint32) (t *Timer, ok bool) {
 	return
 }
 
-// AddTimer 添加定时器
-func (c *Clock) AddTimer(t *Timer) (err error) {
+// AddTimerIntoDB 添加定时器
+func (c *Clock) AddTimerIntoDB(t *Timer) (err error) {
 	c.timersmu.Lock()
-	(*c.timers)[t.ID] = t
 	err = c.db.Insert("timer", t)
 	c.timersmu.Unlock()
 	return
 }
 
+// AddTimerIntoMap 添加定时器到缓存
+func (c *Clock) AddTimerIntoMap(t *Timer) (err error) {
+	c.timersmu.Lock()
+	(*c.timers)[t.ID] = t
+	c.timersmu.Unlock()
+	return
+}
+
 func (c *Clock) loadTimers(db *sql.Sqlite) {
 	c.db = db
 	err := c.db.Create("timer", &Timer{})

plugin_manager/timer/timer_test.go

@@ -27,7 +27,7 @@ func TestNextWakeTime(t *testing.T) {
 func TestClock(t *testing.T) {
 	db := &sql.Sqlite{DBPath: "test.db"}
 	c := NewClock(db)
-	c.AddTimer(GetFilledTimer([]string{"", "12", "-1", "12", "0", "", "test"}, 0, 0, false))
+	c.AddTimerIntoDB(GetFilledTimer([]string{"", "12", "-1", "12", "0", "", "test"}, 0, 0, false))
 	t.Log(c.ListTimers(0))
 	t.Fail()
 }