Skip to content

Commit

Permalink
Merge pull request #3226 from cfromknecht/wtclient-log-fixups
Browse files Browse the repository at this point in the history
watchtower/multi: fix logging in wtclient
  • Loading branch information
cfromknecht authored Jun 20, 2019
2 parents 4247ee2 + fad8932 commit 997023c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion watchtower/wtclient/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ func (c *TowerClient) taskRejected(task *backupTask, curStatus reserveStatus) {
case reserveExhausted:
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)

// Cache the task that we pulled off, so that we can process it
Expand Down
2 changes: 1 addition & 1 deletion watchtower/wtclient/session_queue.go
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ func (q *sessionQueue) AcceptTask(task *backupTask) (reserveStatus, bool) {

numPending := uint32(q.pendingQueue.Len())
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",
q.ID(), task.id, q.seqNum, numPending, maxUpdates)

Expand Down
2 changes: 1 addition & 1 deletion watchtower/wtdb/client_session.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func (b *BackupID) Decode(r io.Reader) error {
}

// 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)
}

Expand Down

0 comments on commit 997023c

Please sign in to comment.