quieten logs

pkg/deploy/generator/rp.go

@@ -476,6 +476,7 @@ ExecStart=/usr/bin/docker run \
   -CertFile /etc/mdm.pem \
   -FrontEndUrl $RPMDMFRONTENDURL \
   -Logger Console \
+  -LogLevel Warning \
   -PrivateKeyFile /etc/mdm.pem \
   -SourceEnvironment $RPMDMSOURCEENVIRONMENT \
   -SourceRole $RPMDMSOURCEROLE \
@@ -519,6 +520,7 @@ ExecStart=/usr/bin/docker run \
 ExecStop=/usr/bin/docker stop -t 3600 %N
 TimeoutStopSec="3600"
 Restart=always
+StandardError=null
 
 [Install]
 WantedBy=multi-user.target
@@ -553,6 +555,7 @@ ExecStart=/usr/bin/docker run \
   $RPIMAGE \
   monitor
 Restart=always
+StandardError=null
 
 [Install]
 WantedBy=multi-user.target

pkg/frontend/frontend.go

@@ -184,7 +184,7 @@ func (f *frontend) authenticatedRoutes(r *mux.Router) {
 
 func (f *frontend) setupRouter() *mux.Router {
 	r := mux.NewRouter()
-	r.Use(middleware.Log(f.baseLog))
+	r.Use(middleware.Log(f.baseLog.WithField("component", "access")))
 	r.Use(middleware.Metrics(f.m))
 	r.Use(middleware.Panic)
 	r.Use(middleware.Headers(f.env))

pkg/frontend/frontend_test.go

@@ -9,10 +9,13 @@ import (
 	"testing"
 
 	"github.com/gorilla/mux"
+	"github.com/sirupsen/logrus"
 )
 
 func TestURLPathsAreLowerCase(t *testing.T) {
-	f := &frontend{}
+	f := &frontend{
+		baseLog: logrus.NewEntry(logrus.StandardLogger()),
+	}
 	router := f.setupRouter()
 
 	varCleanupRe := regexp.MustCompile(`{.*?}`)

pkg/frontend/middleware/log.go

@@ -61,7 +61,6 @@ func Log(baseLog *logrus.Entry) func(http.Handler) http.Handler {
 
 			defer func() {
 				log.WithFields(logrus.Fields{
-					"access":               true,
 					"body_read_bytes":      r.Body.(*logReadCloser).bytes,
 					"body_written_bytes":   w.(*logResponseWriter).bytes,
 					"duration":             time.Now().Sub(t).Seconds(),
@@ -71,17 +70,16 @@ func Log(baseLog *logrus.Entry) func(http.Handler) http.Handler {
 					"request_remote_addr":  r.RemoteAddr,
 					"request_user_agent":   r.UserAgent(),
 					"response_status_code": w.(*logResponseWriter).statusCode,
-				}).Print()
+				}).Print("sent response")
 			}()
 
 			log.WithFields(logrus.Fields{
-				"access":              true,
 				"request_method":      r.Method,
 				"request_path":        r.URL.Path,
 				"request_proto":       r.Proto,
 				"request_remote_addr": r.RemoteAddr,
 				"request_user_agent":  r.UserAgent(),
-			}).Print()
+			}).Print("read request")
 
 			h.ServeHTTP(w, r)
 		})

pkg/monitor/worker.go

@@ -19,11 +19,14 @@ import (
 // listBuckets reads our bucket allocation from the master
 func (mon *monitor) listBuckets(ctx context.Context) error {
 	buckets, err := mon.db.Monitors.ListBuckets(ctx)
-	mon.baseLog.Printf("servicing %d buckets", len(buckets))
 
 	mon.mu.Lock()
 	defer mon.mu.Unlock()
 
+	if len(buckets) != len(mon.buckets) {
+		mon.baseLog.Printf("servicing %d buckets", len(buckets))
+	}
+
 	mon.buckets = map[int]struct{}{}
 
 	if err != nil {