From 076944781c2c3a4525689df4cecc155ed9190bfc Mon Sep 17 00:00:00 2001 From: Irfan Habib Date: Wed, 27 Jun 2018 10:51:00 +0100 Subject: [PATCH 1/2] Configurable backend log level --- deploy/kubernetes/console/templates/deployment.yaml | 4 ++++ deploy/kubernetes/console/values.yaml | 1 + deploy/proxy.env | 1 + src/backend/app-core/main.go | 6 ++++++ src/backend/app-core/repository/interfaces/structs.go | 3 ++- 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml index 5e459bb335..9a777d2e9e 100644 --- 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 }} + - name: LOG_LEVEL + {{- if .Values.console.backendLogLevel }} + 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 index d17e376eef..33d2b80179 100644 --- 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 index 2771731bce..d987b6b263 100644 --- a/deploy/proxy.env +++ b/deploy/proxy.env @@ -21,3 +21,4 @@ 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 +LOG_LEVEL=debug diff --git a/src/backend/app-core/main.go b/src/backend/app-core/main.go index eed4743873..915b4c94d9 100644 --- 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 index 470998a522..b95255b499 100644 --- 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 From 76de57e19e4cacc5bdb71ba66960dd161bc6bb04 Mon Sep 17 00:00:00 2001 From: Irfan Habib Date: Wed, 27 Jun 2018 12:06:03 +0100 Subject: [PATCH 2/2] Changes in response to feedback --- deploy/development.rc.template | 3 +++ deploy/kubernetes/console/templates/deployment.yaml | 2 +- deploy/proxy.env | 3 +-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/deploy/development.rc.template b/deploy/development.rc.template index 053138fa34..afea14dedd 100644 --- 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 index 9a777d2e9e..1b1e543e83 100644 --- a/deploy/kubernetes/console/templates/deployment.yaml +++ b/deploy/kubernetes/console/templates/deployment.yaml @@ -159,8 +159,8 @@ spec: {{- if .Values.socksProxy }} value: {{.Values.socksProxy}} {{- end }} - - name: LOG_LEVEL {{- if .Values.console.backendLogLevel }} + - name: LOG_LEVEL value: {{.Values.console.backendLogLevel}} {{- end }} {{- if or .Values.env.UAA_HOST .Values.env.DOMAIN }} diff --git a/deploy/proxy.env b/deploy/proxy.env index d987b6b263..518adc5849 100644 --- a/deploy/proxy.env +++ b/deploy/proxy.env @@ -20,5 +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 -LOG_LEVEL=debug +ENCRYPTION_KEY=B374A26A71490437AA024E4FADD5B497FDFF1A8EA6FF12F6FB65AF2720B59CCF \ No newline at end of file