Merge pull request #2533 from cloudfoundry-incubator/set-log-level

Configurable backend log level
cloudfoundry · Jun 27, 2018 · 8b7d5a4 · 8b7d5a4
2 parents e2a320d + 76de57e
commit 8b7d5a4
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 2 deletions.
diff --git a/deploy/development.rc.template b/deploy/development.rc.template
@@ -5,6 +5,9 @@
 # Note: stand-up-dev-env.sh will try to use it if it's present.
 
 
+# Enable Debug logging for Jetstream
+#export LOG_LEVEL=debug
+
 ###################
 # Corporate Proxy #
 ###################

diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
@@ -159,6 +159,10 @@ spec:
         {{- if .Values.socksProxy }}
           value: {{.Values.socksProxy}}
         {{- end }}
+        {{- if .Values.console.backendLogLevel }}
+        - name: LOG_LEVEL
+          value: {{.Values.console.backendLogLevel}}
+        {{- end }}
         {{- if or .Values.env.UAA_HOST .Values.env.DOMAIN }}  
         - name: UAA_ENDPOINT 
           value: {{ template "scfUaaEndpoint" . }}

diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
@@ -15,6 +15,7 @@ console:
   port: 443
   cookieDomain:
 # externalIP: 127.0.0.1
+  backendLogLevel: info
 images:
   console: stratos-console
   proxy: stratos-jetstream

diff --git a/deploy/proxy.env b/deploy/proxy.env
@@ -20,4 +20,4 @@ ALLOWED_ORIGINS=http://nginx
 SESSION_STORE_SECRET=wheeee!
 CONSOLE_PROXY_CERT_KEY=use local dev-cert/pproxy.key in portal-proxy repo
 CONSOLE_PROXY_CERT=use local dev-cert/pproxy.crt in portal-proxy repo
-ENCRYPTION_KEY=B374A26A71490437AA024E4FADD5B497FDFF1A8EA6FF12F6FB65AF2720B59CCF
+ENCRYPTION_KEY=B374A26A71490437AA024E4FADD5B497FDFF1A8EA6FF12F6FB65AF2720B59CCF
diff --git a/src/backend/app-core/main.go b/src/backend/app-core/main.go
@@ -95,6 +95,12 @@ func main() {
 	if err != nil {
 		log.Fatal(err) // calls os.Exit(1) after logging
 	}
+	if portalConfig.LogLevel != "" {
+		log.Infof("Setting log level to: %s", portalConfig.LogLevel)
+		level, _ := log.ParseLevel(portalConfig.LogLevel)
+		log.SetLevel(level)
+	}
+
 	log.Info("Configuration loaded.")
 	isUpgrading := isConsoleUpgrading()
 

diff --git a/src/backend/app-core/repository/interfaces/structs.go b/src/backend/app-core/repository/interfaces/structs.go
@@ -201,8 +201,9 @@ type PortalConfig struct {
 	EncryptionKeyFilename           string   `configName:"ENCRYPTION_KEY_FILENAME"`
 	EncryptionKey                   string   `configName:"ENCRYPTION_KEY"`
 	AutoRegisterCFUrl               string   `configName:"AUTO_REG_CF_URL"`
-	SSOLogin						bool	 `configName:"SSO_LOGIN"`
+	SSOLogin                        bool     `configName:"SSO_LOGIN"`
 	CookieDomain                    string   `configName:"COOKIE_DOMAIN"`
+	LogLevel                        string   `configName:"LOG_LEVEL"`
 	CFAdminIdentifier               string
 	CloudFoundryInfo                *CFInfo
 	HTTPS                           bool