improve agent logs

topfreegames · Oct 23, 2019 · e6fe458 · e6fe458
1 parent 26e1c39
commit e6fe458
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/agent/agent.go b/agent/agent.go
@@ -230,7 +230,7 @@ func (a *Agent) RemoteAddr() net.Addr {
 
 // String, implementation for Stringer interface
 func (a *Agent) String() string {
-	return fmt.Sprintf("Remote=%s, LastTime=%d", a.conn.RemoteAddr().String(), atomic.LoadInt64(&a.lastAt))
+	return fmt.Sprintf("Remote=%s, LastTime=%d, ID=%d", a.conn.RemoteAddr().String(), atomic.LoadInt64(&a.lastAt), a.Session.ID())
 }
 
 // GetStatus gets the status
@@ -304,15 +304,17 @@ func (a *Agent) heartbeat() {
 		case <-ticker.C:
 			deadline := time.Now().Add(-2 * a.heartbeatTimeout).Unix()
 			if atomic.LoadInt64(&a.lastAt) < deadline {
-				logger.Log.Debugf("Session heartbeat timeout, LastTime=%d, Deadline=%d", atomic.LoadInt64(&a.lastAt), deadline)
+				logger.Log.Debugf("Session heartbeat timeout, LastTime=%d, Deadline=%d, ID=%d", atomic.LoadInt64(&a.lastAt), deadline, a.Session.ID())
 				return
 			}
 			if _, err := a.conn.Write(hbd); err != nil {
+				logger.Log.Errorf("Failed to send heartbeat, ID=%d", a.Session.ID())
 				return
 			}
 		case <-a.chDie:
 			return
 		case <-a.chStopHeartbeat:
+			logger.Log.Debugf("Stopping session heartbeat, ID=%d", a.Session.ID())
 			return
 		}
 	}

diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -482,7 +482,7 @@ func TestAgentString(t *testing.T) {
 	assert.NotNil(t, ag)
 
 	mockConn.EXPECT().RemoteAddr().Return(&mockAddr{})
-	expected := fmt.Sprintf("Remote=remote-string, LastTime=%d", ag.lastAt)
+	expected := fmt.Sprintf("Remote=remote-string, LastTime=%d, ID=%d", ag.lastAt, ag.Session.ID())
 	str := ag.String()
 	assert.Equal(t, expected, str)
 }