diff --git a/api/scanner/process_image.go b/api/scanner/process_image.go index 0c119aaf..b88b248f 100644 --- a/api/scanner/process_image.go +++ b/api/scanner/process_image.go @@ -27,7 +27,7 @@ import ( func ProcessImage(tx *sql.Tx, photoPath string, albumId int, content_type string) error { - log.Printf("Processing image: %s\n", photoPath) + // log.Printf("Processing image: %s\n", photoPath) photoName := path.Base(photoPath) diff --git a/api/server/cors_middleware.go b/api/server/cors_middleware.go index f8f6edcf..39fa9c43 100644 --- a/api/server/cors_middleware.go +++ b/api/server/cors_middleware.go @@ -42,6 +42,8 @@ func CORSMiddleware(devMode bool) mux.MiddlewareFunc { if req.Method != http.MethodOptions { next.ServeHTTP(w, req) + } else { + w.WriteHeader(200) } }) } diff --git a/api/server/logging.go b/api/server/logging.go index a19bf095..9b15d0ba 100644 --- a/api/server/logging.go +++ b/api/server/logging.go @@ -37,13 +37,26 @@ func LoggingMiddleware(next http.Handler) http.Handler { statusColor = color.Colorize("r") } + method := r.Method + var methodColor string + switch { + case method == http.MethodGet: + methodColor = color.Colorize("b") + case method == http.MethodPost: + methodColor = color.Colorize("g") + case method == http.MethodOptions: + methodColor = color.Colorize("y") + default: + methodColor = color.Colorize("r") + } + user := auth.UserFromContext(r.Context()) userText := "unauthenticated" if user != nil { userText = color.Sprintf("@ruser: %s", user.Username) } - statusText := color.Sprintf("%s%s %d", statusColor, r.Method, status) + statusText := color.Sprintf("%s%s %s%d", methodColor, r.Method, statusColor, status) requestText := fmt.Sprintf("%s%s", r.Host, r.URL.Path) durationText := color.Sprintf("@c%s", elapsed)