[server] Set Probot log level according to config

gitpod-io · Sep 15, 2021 · 7015936 · 7015936
1 parent 0d6f3bb
commit 7015936
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
@@ -183,7 +183,13 @@ env:
 - name: GITPOD_INSTALLATION_SHORTNAME
   value: {{ template "gitpod.installation.shortname" . }}
 - name: LOG_LEVEL
-  value: {{ $gp.log.level | default "debug" | lower | quote }}
+  value: {{ template "gitpod.loglevel" }}
+{{- end -}}
+
+{{- define "gitpod.loglevel" -}}
+{{- $ := .root -}}
+{{- $gp := .gp -}}
+{{ $gp.log.level | default "debug" | lower | quote }}
 {{- end -}}
 
 {{- define "gitpod.container.analyticsEnv" -}}

diff --git a/chart/templates/server-configmap.yaml b/chart/templates/server-configmap.yaml
@@ -23,6 +23,7 @@ data:
 {{- if .Values.devBranch }}
         "devBranch": "{{ .Values.devBranch }}",
 {{- end }}
+        "logLevel": {{ template "gitpod.loglevel" }},
         "license": "{{ .Values.license }}",
         "workspaceHeartbeat": {{ $comp.workspaceHeartbeat | toJson }},
         "workspaceDefaults": {

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -299,7 +299,6 @@ components:
     githubApp:
       enabled: false
       authProviderId: "Public-GitHub"
-      logLevel: "trace"
     blockNewUsers:
       enabled: false
       passlist: []

diff --git a/components/server/ee/src/prebuilds/github-app.ts b/components/server/ee/src/prebuilds/github-app.ts
@@ -12,7 +12,7 @@ import { injectable, inject } from 'inversify';
 import { Config } from '../../../src/config';
 import { AppInstallationDB, TracedWorkspaceDB, DBWithTracing, UserDB, WorkspaceDB, ProjectDB, TeamDB } from '@gitpod/gitpod-db/lib';
 import * as express from 'express';
-import { log, LogContext } from '@gitpod/gitpod-protocol/lib/util/logging';
+import { log, LogContext, LogrusLogLevel } from '@gitpod/gitpod-protocol/lib/util/logging';
 import { WorkspaceConfig, User, Project, StartPrebuildResult } from '@gitpod/gitpod-protocol';
 import { MessageBusIntegration } from '../../../src/workspace/messagebus-integration';
 import { GithubAppRules } from './github-app-rules';
@@ -55,7 +55,7 @@ export class GithubApp {
                     appId: config.githubApp.appId,
                     privateKey: GithubApp.loadPrivateKey(config.githubApp.certPath),
                     secret: config.githubApp.webhookSecret,
-                    logLevel: config.githubApp.logLevel as Options["logLevel"],
+                    logLevel: GithubApp.mapToGitHubLogLevel(config.logLevel),
                     baseUrl: config.githubApp.baseUrl,
                 })
             });
@@ -393,4 +393,15 @@ export namespace GithubApp {
             }
         }
     }
+
+    export function mapToGitHubLogLevel(logLevel: LogrusLogLevel): Options["logLevel"] {
+        switch (logLevel) {
+            case "warning":
+                return "warn";
+            case "panic":
+                return "fatal";
+            default:
+                return logLevel;
+        }
+    }
 }
diff --git a/components/server/src/config.ts b/components/server/src/config.ts
@@ -13,7 +13,7 @@ import { RateLimiterConfig } from './auth/rate-limiter';
 import { CodeSyncConfig } from './code-sync/code-sync-service';
 import { ChargebeeProviderOptions, readOptionsFromFile } from "@gitpod/gitpod-payment-endpoint/lib/chargebee";
 import * as fs from 'fs';
-import { log } from '@gitpod/gitpod-protocol/lib/util/logging';
+import { log, LogrusLogLevel } from '@gitpod/gitpod-protocol/lib/util/logging';
 import { filePathTelepresenceAware, KubeStage, translateLegacyStagename } from '@gitpod/gitpod-protocol/lib/env';
 import { BrandingParser } from './branding-parser';
 
@@ -51,6 +51,7 @@ export interface ConfigSerialized {
     stage: string;
     devBranch?: string;
     insecureNoDomain: boolean;
+    logLevel: LogrusLogLevel;
 
     license?: string;
 
@@ -74,7 +75,6 @@ export interface ConfigSerialized {
         authProviderId: string;
         certPath: string;
         marketplaceName: string;
-        logLevel?: string;
     };
 
     definitelyGpDisabled: boolean;