Change logging

Author: Foivos Filippopoulos

main.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/utilitywarehouse/gcp-disk-snapshotter/models"
 	"github.com/utilitywarehouse/gcp-disk-snapshotter/snapshot"
 	"github.com/utilitywarehouse/gcp-disk-snapshotter/watch"
@@ -16,15 +17,29 @@ var (
 	flagZones           = flag.String("zones", "", "(Required) Comma separated list of zones where projects disks may live")
 	flagLabels          = flag.String("labels", "", "(Required) Comma separated list of disk labels in format <name>:<value>")
 	flagSnapPrefix      = flag.String("snap_prefix", "", "Prefix for created snapshots")
+	flagWatchInterval   = flag.Int("watch_interval", 60, "Interval between watch cycles in seconds. Defaults to 60s")
 	flagRetentionHours  = flag.Int("retention_hours", 720, "Retention Duration in hours. Defaults to 720h = 1 month")
 	flagIntervalSeconds = flag.Int("interval_secs", 43200, "Interval between snapshots in seconds. Defaults to 43200s = 12h")
+	flagLogLevel        = flag.String("log_level", "info", "Log Level, defaults to INFO")
 )
 
 func usage() {
 	flag.Usage()
 	os.Exit(2)
 }
 
+func initLogging(logLevel string) {
+	log.SetFormatter(&log.TextFormatter{
+		FullTimestamp: true,
+	})
+
+	level, err := log.ParseLevel(logLevel)
+	if err != nil {
+		log.Fatal("error parsing log level: %v", err)
+	}
+	log.SetLevel(level)
+}
+
 func main() {
 
 	// Flag Parsing
@@ -57,13 +72,18 @@ func main() {
 	}
 
 	snapPrefix := *flagSnapPrefix
+	watchInterval := *flagWatchInterval
 	retentionHours := *flagRetentionHours
 	intervalSecs := *flagIntervalSeconds
+	logLevel := *flagLogLevel
+
+	// Init logging
+	initLogging(logLevel)
 
 	// Create a snapshotter
 	gsc := snapshot.CreateGCPSnapClient(project, snapPrefix, zones, *labels)
 
 	// Start watching
-	watch.Watch(gsc, retentionHours, intervalSecs)
+	watch.Watch(gsc, watchInterval, retentionHours, intervalSecs)
 
 }

snapshot/client.go

@@ -3,7 +3,7 @@ package snapshot
 import (
 	"context"
 	"fmt"
-	"log"
+	log "github.com/sirupsen/logrus"
 	"net/http"
 	"strings"
 	"time"
@@ -46,12 +46,12 @@ func CreateGCPSnapClient(project, snapPrefix string, zones []string, labels mode
 	ctx := context.Background()
 	googleClient, err := google.DefaultClient(ctx, compute.ComputeScope)
 	if err != nil {
-		log.Fatal(err)
+		log.Fatal("Failed to create google client:", err)
 	}
 
 	computeService, err := compute.New(googleClient)
 	if err != nil {
-		log.Fatal(err)
+		log.Fatal("Failed to create compute service:", err)
 	}
 
 	return &GCPSnapClient{

watch/watch.go

@@ -1,6 +1,7 @@
 package watch
 
 import (
+	"fmt"
 	"time"
 
 	log "github.com/sirupsen/logrus"
@@ -11,16 +12,18 @@ import (
 // From https://golang.org/src/time/format.go
 const GCPSnapshotTimestampLayout string = "2006-01-02T15:04:05Z07:00"
 
-func Watch(gsc *snapshot.GCPSnapClient, retentionHours, intervalSecs int) {
+func Watch(gsc *snapshot.GCPSnapClient, watchInterval, retentionHours, intervalSecs int) {
 
 	for t := time.Tick(time.Second * 60); ; <-t {
 
 		retentionStart := time.Now().Add(-time.Duration(retentionHours) * time.Hour)
 		lastAcceptedCreation := time.Now().Add(time.Duration(-intervalSecs) * time.Second)
+
 		log.WithFields(log.Fields{
-			"Retention Start":         retentionStart,
+			"Watch Interval in secs":  watchInterval,
+			"Retention Period Start":  retentionStart,
 			"last accepted snap time": lastAcceptedCreation,
-		}).Info("Initiating watch cycle")
+		}).Info("Initiating new disk watch cycle")
 
 		// Get disks
 		disks, err := gsc.GetDiskList()
@@ -30,7 +33,7 @@ func Watch(gsc *snapshot.GCPSnapClient, retentionHours, intervalSecs int) {
 		}
 
 		for _, disk := range disks {
-			log.Info("Checking disk: ", disk.Name)
+			log.Debug("Checking disk: ", disk.Name)
 
 			// Get snapshots per disk created by the snapshotter
 			snaps, err := gsc.ListClientCreatedSnapshots(disk.SelfLink)
@@ -93,11 +96,12 @@ func deleteSnapshots(gsc *snapshot.GCPSnapClient, sl []compute.Snapshot) error {
 }
 
 func createSnapshot(gsc *snapshot.GCPSnapClient, d compute.Disk) error {
-	log.Info("Taking snapshot of disk: ", d.Name)
+	log.Debug("Attempt to take snapshot of disk: ", d.Name)
 	op, err := gsc.CreateSnapshot(d.Name, d.Zone)
 	if err != nil {
 		return err
 	}
+	log.Info(fmt.Sprintf("New snapshot of disk: %v operation: %v", d.Name, op))
 
 	// Create snapshot is a zonal operation!!!
 	go pollZonalOperation(gsc, op, d.Zone)
@@ -109,8 +113,7 @@ func pollZonalOperation(gsc *snapshot.GCPSnapClient, operation, zone string) {
 	for {
 		status, err := gsc.GetZonalOperationStatus(operation, zone)
 		if err != nil {
-			log.Info("Operation failed: ", operation)
-			log.Error(err)
+			log.Error("Operation failed: ", operation, err)
 			break
 		}
 		if status == "DONE" {
@@ -125,8 +128,7 @@ func pollGlobalOperation(gsc *snapshot.GCPSnapClient, operation string) {
 	for {
 		status, err := gsc.GetGlobalOperationStatus(operation)
 		if err != nil {
-			log.Info("Operation failed: ", operation)
-			log.Error(err)
+			log.Error("Operation failed: ", operation, err)
 			break
 		}
 		if status == "DONE" {