Merge pull request #3226 from cfromknecht/wtclient-log-fixups

watchtower/multi: fix logging in wtclient
This commit is contained in:
Conner Fromknecht 2019-06-20 14:10:02 -07:00 committed by GitHub
commit 997023cd7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

@ -738,7 +738,7 @@ func (c *TowerClient) taskRejected(task *backupTask, curStatus reserveStatus) {
case reserveExhausted: case reserveExhausted:
c.stats.sessionExhausted() c.stats.sessionExhausted()
log.Debugf("Session %v exhausted, %s queued for next session", log.Debugf("Session %v exhausted, %v queued for next session",
c.sessionQueue.ID(), task.id) c.sessionQueue.ID(), task.id)
// Cache the task that we pulled off, so that we can process it // Cache the task that we pulled off, so that we can process it

@ -199,7 +199,7 @@ func (q *sessionQueue) AcceptTask(task *backupTask) (reserveStatus, bool) {
numPending := uint32(q.pendingQueue.Len()) numPending := uint32(q.pendingQueue.Len())
maxUpdates := q.cfg.ClientSession.Policy.MaxUpdates maxUpdates := q.cfg.ClientSession.Policy.MaxUpdates
log.Debugf("SessionQueue(%x) deciding to accept %v seqnum=%d "+ log.Debugf("SessionQueue(%s) deciding to accept %v seqnum=%d "+
"pending=%d max-updates=%d", "pending=%d max-updates=%d",
q.ID(), task.id, q.seqNum, numPending, maxUpdates) q.ID(), task.id, q.seqNum, numPending, maxUpdates)

@ -162,7 +162,7 @@ func (b *BackupID) Decode(r io.Reader) error {
} }
// String returns a human-readable encoding of a BackupID. // String returns a human-readable encoding of a BackupID.
func (b *BackupID) String() string { func (b BackupID) String() string {
return fmt.Sprintf("backup(%x, %d)", b.ChanID, b.CommitHeight) return fmt.Sprintf("backup(%x, %d)", b.ChanID, b.CommitHeight)
} }