Logging tweaks

certs/monitor.go

@@ -31,6 +31,7 @@ func (c *CertificateMonitor) AddDirectory(directory string) {
 }
 
 func (c *CertificateMonitor) scanForFolders(dir string) {
+	c.logger.Debugf("Scanning folder %s for certificates", dir)
 	dirs, err := ioutil.ReadDir(dir)
 	if err != nil {
 		c.logger.Errorf("Unable to read directory %s - %s", dir, err.Error())
@@ -45,6 +46,7 @@ func (c *CertificateMonitor) scanForFolders(dir string) {
 }
 
 func (c *CertificateMonitor) scanForCerts(vhost string, dir string) {
+	c.logger.Debugf("Scanning folder %s for certificates for %s", dir, vhost)
 	files, err := ioutil.ReadDir(dir)
 	if err != nil {
 		c.logger.Errorf("Unable to read directory %s - %s", dir, err.Error())

docker/monitor.go

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

dotege.go

@@ -60,7 +60,7 @@ func main() {
 	}
 
 	certMonitor := certs.NewCertificateManager(sugar, certChan)
-	certMonitor.AddDirectory("/data/certrequests/certs")
+	certMonitor.AddDirectory("/data/certrequests/certs/")
 	certDeployer := certs.NewCertificateDeployer(sugar, certChan)
 
 	templateGenerator := NewTemplateGenerator(sugar)