Skip to content

[server] Remove logLevel from server config #9651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2022
Merged

[server] Remove logLevel from server config #9651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion components/server/ee/src/prebuilds/github-app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,14 @@ export class GithubApp {
@inject(PrebuildStatusMaintainer) protected readonly statusMaintainer: PrebuildStatusMaintainer,
) {
if (config.githubApp?.enabled) {
const logLevel = LogrusLogLevel.getFromEnv() ?? "info";

this.server = new Server({
Probot: Probot.defaults({
appId: config.githubApp.appId,
privateKey: GithubApp.loadPrivateKey(config.githubApp.certPath),
secret: config.githubApp.webhookSecret,
logLevel: GithubApp.mapToGitHubLogLevel(config.logLevel),
logLevel: GithubApp.mapToGitHubLogLevel(logLevel),
baseUrl: config.githubApp.baseUrl,
}),
});
Expand Down
3 changes: 1 addition & 2 deletions components/server/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { CodeSyncConfig } from "./code-sync/code-sync-service";
import { ChargebeeProviderOptions, readOptionsFromFile } from "@gitpod/gitpod-payment-endpoint/lib/chargebee";
import * as fs from "fs";
import * as yaml from "js-yaml";
import { log, LogrusLogLevel } from "@gitpod/gitpod-protocol/lib/util/logging";
import { log } from "@gitpod/gitpod-protocol/lib/util/logging";
import { filePathTelepresenceAware } from "@gitpod/gitpod-protocol/lib/env";

export const Config = Symbol("Config");
Expand Down Expand Up @@ -52,7 +52,6 @@ export interface ConfigSerialized {
installationShortname: string;
devBranch?: string;
insecureNoDomain: boolean;
logLevel: LogrusLogLevel;

// Use one or other - licenseFile reads from a file and populates license
license?: string;
Expand Down