Merge pull request #124 from movio/movio-tweaks

Small changes for Movio

execution.go

@@ -82,11 +82,7 @@ func (s *ExecutableSchema) UpdateSchema(forceRebuild bool) error {
 	promServiceUpdateError.Reset()
 
 	for url, s := range s.Services {
-		logger := log.WithFields(log.Fields{
-			"url":     url,
-			"version": s.Version,
-			"service": s.Name,
-		})
+		logger := log.WithField("url", url)
 		updated, err := s.Update()
 		if err != nil {
 			promServiceUpdateError.WithLabelValues(s.ServiceURL).Inc()
@@ -95,9 +91,13 @@ func (s *ExecutableSchema) UpdateSchema(forceRebuild bool) error {
 			// Ignore this service in this update
 			continue
 		}
+		logger = log.WithFields(log.Fields{
+			"version": s.Version,
+			"service": s.Name,
+		})
 
 		if updated {
-			logger.Info("service was upgraded")
+			logger.Info("service was updated")
 			updatedServices = append(updatedServices, s.Name)
 		}
 

main.go

@@ -16,7 +16,8 @@ import (
 // when building Bramble with custom plugins.
 func Main() {
 	var configFiles arrayFlags
-	flag.Var(&configFiles, "conf", "Config file (can appear multiple times)")
+	flag.Var(&configFiles, "config", "Config file (can appear multiple times)")
+	flag.Var(&configFiles, "conf", "deprecated, use -config instead")
 	flag.Parse()
 
 	log.SetFormatter(&log.JSONFormatter{TimestampFormat: time.RFC3339Nano})