bughz
/
code-server
mirror of https://github.com/coder/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixup: support this.args.log as string 

Seems like upstream now uses a string[] for this. For now, support
string.

See
2b50ab06b1
This commit is contained in:
Joe Previte 2022-11-08 14:55:07 -07:00
parent b53ca8af6d
commit 78c02a1f13
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
patches/integration.diff
View File

@ -272,3 +272,21 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
embedderIdentifier: 'server-distro', embedderIdentifier: 'server-distro',
extensionsGallery: this._webExtensionResourceUrlTemplate ? { extensionsGallery: this._webExtensionResourceUrlTemplate ? {
...this._productService.extensionsGallery, ...this._productService.extensionsGallery,
Index: code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts
===================================================================
--- code-server.orig/lib/vscode/src/vs/platform/environment/common/environmentService.ts
+++ code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts
@@ -223,7 +223,12 @@ export abstract class AbstractNativeEnvi
get verbose(): boolean { return !!this.args.verbose; }
@memoize
- get logLevel(): string | undefined { return this.args.log?.find(entry => !EXTENSION_IDENTIFIER_WITH_LOG_REGEX.test(entry)); }
+ get logLevel(): string | undefined {
+ if (typeof this.args.log === "string") {
+ return this.args.log
+ }
+ return this.args.log?.find(entry => !EXTENSION_IDENTIFIER_WITH_LOG_REGEX.test(entry));
+ }
@memoize
get extensionLogLevel(): [string, string][] | undefined {
const result: [string, string][] = [];