Fix yaml struct tag, add request logging (#5)

* Fix struct tag: json -> yaml on ACL.Deployers

* Add request logging and proxy error handler

Author: firecow

internal/acl.go

@@ -19,7 +19,7 @@ type ACLDeployer struct {
 }
 
 type ACL struct {
-	Deployers []*ACLDeployer `json:"deployers"`
+	Deployers []*ACLDeployer `yaml:"deployers"`
 }
 
 func NewACL(aclFilePath string) *ACL {

main.go

@@ -57,9 +57,13 @@ func main() {
 				return net.Dial("unix", *dockerSocket)
 			},
 		},
+		ErrorHandler: func(w http.ResponseWriter, r *http.Request, err error) {
+			logger.Error("proxy error", zap.String("method", r.Method), zap.String("path", r.URL.Path), zap.Error(err))
+			http.Error(w, err.Error(), http.StatusBadGateway)
+		},
 	}
 
-	handler := authMiddleware(logger, acl, servicesEditGuard, proxy)
+	handler := requestLogger(logger, authMiddleware(logger, acl, servicesEditGuard, proxy))
 
 	server := &http.Server{
 		Addr:    *listen,
@@ -80,6 +84,13 @@ func main() {
 	}
 }
 
+func requestLogger(logger *zap.Logger, next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		logger.Info("request", zap.String("method", r.Method), zap.String("path", r.URL.Path), zap.String("upgrade", r.Header.Get("Upgrade")))
+		next.ServeHTTP(w, r)
+	})
+}
+
 func authMiddleware(logger *zap.Logger, acl *internal.ACL, servicesEditGuard *guards.ServicesEdit, next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		username := r.Header.Get("X-Docker-Auth-Username")