From cce393a6e01323119f78f6a977f2d60e36ec2de0 Mon Sep 17 00:00:00 2001
From: Sereyvathana Ty <sty@fb.com>
Date: Wed, 29 Jan 2020 20:39:45 -0800
Subject: [PATCH] fix invalid logging method for api, default to none

---
 cmd/api/main.go     | 4 ++--
 docker/dockerize.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/api/main.go b/cmd/api/main.go
index 2d6c7f1a..0d565bc5 100644
--- a/cmd/api/main.go
+++ b/cmd/api/main.go
@@ -121,10 +121,10 @@ func loadConfiguration(file string) (types.JSONConfigurationService, error) {
 	}
 	// Check if values are valid
 	if !validAuth[cfg.Auth] {
-		return cfg, fmt.Errorf("Invalid auth method")
+		return cfg, fmt.Errorf("Invalid auth method: '%s'", cfg.Auth)
 	}
 	if !validLogging[cfg.Logging] {
-		return cfg, fmt.Errorf("Invalid logging method")
+		return cfg, fmt.Errorf("Invalid logging method: '%s'", cfg.Logging)
 	}
 	// No errors!
 	return cfg, nil
diff --git a/docker/dockerize.sh b/docker/dockerize.sh
index d6f9bd8e..bdc057ed 100755
--- a/docker/dockerize.sh
+++ b/docker/dockerize.sh
@@ -225,7 +225,7 @@ API_JSON="$CONFIGDIR/api.json"
 if [[ -f "$API_JSON" && "$_FORCE" == false ]]; then
   log "Using existing $API_JSON"
 else
-  configuration_service "$DEPLOYDIR/service.json" "$API_JSON" "localhost|9002" "api" "0.0.0.0" "jwt" "db"
+  configuration_service "$DEPLOYDIR/service.json" "$API_JSON" "localhost|9002" "api" "0.0.0.0" "jwt" "none"
 fi
 
 log "Preparing configuration for JWT"