未验证 提交 4543e011 编写于 作者: C Changxin Miao 提交者: GitHub

Heartbeat should have consistent date format (#396)

* Fix missing error placeholder: 'update session: %!s(<nil>)'

* Heartbeat should have consistent date format
上级 17abf359
......@@ -1358,7 +1358,7 @@ func (m *dbMeta) cleanStaleSession(sid uint64) {
func (m *dbMeta) cleanStaleSessions() {
// TODO: once per minute
var s session
rows, err := m.engine.Where("Heartbeat < ?", time.Now().Add(time.Minute*-5)).Rows(&s)
rows, err := m.engine.Where("Heartbeat < ?", time.Now().Add(time.Minute*-5).UTC()).Rows(&s)
if err != nil {
logger.Warnf("scan stale sessions: %s", err)
return
......@@ -1385,8 +1385,11 @@ func (m *dbMeta) refreshSession() {
for {
time.Sleep(time.Minute)
_ = m.txn(func(ses *xorm.Session) error {
n, err := ses.Cols("Heartbeat").Update(&session{Heartbeat: time.Now()}, &session{Sid: m.sid})
if err != nil || n == 0 {
n, err := ses.Cols("Heartbeat").Update(&session{Heartbeat: time.Now().UTC()}, &session{Sid: m.sid})
if err == nil && n == 0 {
err = fmt.Errorf("no session found matching sid: %d", m.sid)
}
if err != nil {
logger.Errorf("update session: %s", err)
}
return err
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册