luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

consul: Improve log message

This commit is contained in:
Armon Dadgar 2014-12-18 17:02:43 -08:00
parent bf40a2ac1f
commit 4f6f5ae6f0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
consul/state_store.go
View File

@ -1458,19 +1458,19 @@ func (s *StateStore) ReapTombstones(index uint64) error {
} }
}() }()
if err := s.tombstoneTable.StreamTxn(streamCh, tx, "id"); err != nil { if err := s.tombstoneTable.StreamTxn(streamCh, tx, "id"); err != nil {
s.logger.Printf("[ERR] consul.state: Failed to scan tombstones: %v", err) s.logger.Printf("[ERR] consul.state: failed to scan tombstones: %v", err)
return fmt.Errorf("failed to scan tombstones: %v", err) return fmt.Errorf("failed to scan tombstones: %v", err)
} }
<-doneCh <-doneCh
// Delete each tombstone // Delete each tombstone
if len(toDelete) > 0 { if len(toDelete) > 0 {
s.logger.Printf("[DEBUG] consul.state: Reaping %d tombstones", len(toDelete)) s.logger.Printf("[DEBUG] consul.state: reaping %d tombstones up to %d", len(toDelete), index)
} }
for _, key := range toDelete { for _, key := range toDelete {
num, err := s.tombstoneTable.DeleteTxn(tx, "id", key) num, err := s.tombstoneTable.DeleteTxn(tx, "id", key)
if err != nil { if err != nil {
s.logger.Printf("[ERR] consul.state: Failed to delete tombstone: %v", err) s.logger.Printf("[ERR] consul.state: failed to delete tombstone: %v", err)
return fmt.Errorf("failed to delete tombstone: %v", err) return fmt.Errorf("failed to delete tombstone: %v", err)
} }
if num != 1 { if num != 1 {