Merge pull request #1169 from filipw/feature/993

Allow configuring any supported Omnisharp log level
dotnet · Feb 3, 2017 · 0a9f0d9 · 0a9f0d9
2 parents 187a5a2 + 0ec1b46
commit 0a9f0d9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -356,10 +356,14 @@
         },
         "omnisharp.loggingLevel": {
           "type": "string",
-          "default": "default",
+          "default": "information",
           "enum": [
-            "default",
-            "verbose"
+            "trace",
+            "debug",
+            "information",
+            "warning",
+            "error",
+            "critical"
           ],
           "description": "Specifies the level of logging output from the OmniSharp server."
         },

diff --git a/src/omnisharp/options.ts b/src/omnisharp/options.ts
@@ -33,7 +33,12 @@ export class Options {
             ? csharpConfig.get<boolean>('omnisharpUsesMono')
             : omnisharpConfig.get<boolean>('useMono');
 
-        const loggingLevel = omnisharpConfig.get<string>('loggingLevel');
+        // support the legacy "verbose" level as "debug"
+        let loggingLevel = omnisharpConfig.get<string>('loggingLevel');
+        if (loggingLevel.toLowerCase() === 'verbose') {
+            loggingLevel = 'debug';
+        }
+
         const autoStart = omnisharpConfig.get<boolean>('autoStart', true);
 
         const projectLoadTimeout = omnisharpConfig.get<number>('projectLoadTimeout', 60);

diff --git a/src/omnisharp/server.ts b/src/omnisharp/server.ts
@@ -235,20 +235,17 @@ export class OmniSharpServer {
 
         const solutionPath = launchTarget.target;
         const cwd = path.dirname(solutionPath);
+        this._options = Options.Read();
+
         let args = [
             '-s', solutionPath,
             '--hostPID', process.pid.toString(),
             '--stdio',
             'DotNet:enablePackageRestore=false',
-            '--encoding', 'utf-8'
+            '--encoding', 'utf-8',
+            '--loglevel', this._options.loggingLevel
         ];
 
-        this._options = Options.Read();
-
-        if (this._options.loggingLevel === 'verbose') {
-            args.push('-v');
-        }
-
         this._logger.appendLine(`Starting OmniSharp server at ${new Date().toLocaleString()}`);
         this._logger.increaseIndent();
         this._logger.appendLine(`Target: ${solutionPath}`);