|
@@ -104,9 +104,9 @@ func (c *ContainerMonitor) scheduleExpiry(name string) {
|
104
|
104
|
now := time.Now()
|
105
|
105
|
expiryTime := now.Add(c.deletionTime)
|
106
|
106
|
c.expiryTimes[name] = expiryTime
|
107
|
|
- c.logger.Info("Scheduling expiry timer for %s", name)
|
|
107
|
+ c.logger.Infof("Scheduling expiry timer for %s", name)
|
108
|
108
|
if c.nextExpiry.Before(now) || c.nextExpiry.After(expiryTime) {
|
109
|
|
- c.logger.Debug("Starting expiry timer with default duration")
|
|
109
|
+ c.logger.Debugf("Starting expiry timer with default duration")
|
110
|
110
|
c.expiryTimer.Reset(c.deletionTime + 1*time.Second)
|
111
|
111
|
c.nextExpiry = expiryTime
|
112
|
112
|
}
|
|
@@ -118,7 +118,7 @@ func (c *ContainerMonitor) publishExpiredContainers() {
|
118
|
118
|
|
119
|
119
|
for name, expiryTime := range c.expiryTimes {
|
120
|
120
|
if expiryTime.Before(now) {
|
121
|
|
- c.logger.Info("Expiring %s", name)
|
|
121
|
+ c.logger.Infof("Expiring %s", name)
|
122
|
122
|
delete(c.expiryTimes, name)
|
123
|
123
|
c.goneContainerNames <- name
|
124
|
124
|
} else if next == 0 || expiryTime.Sub(now) < next {
|