hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-03 20:58:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

C#: Minor refactoring.

Browse Source
This commit is contained in:
Michael Nebel
2022-02-23 13:58:19 +01:00
parent 4973224de7
commit d947861690
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
csharp/extractor/Semmle.Extraction.CSharp.Standalone/Program.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using Semmle.BuildAnalyser;
using Semmle.Util.Logging;
@@ -56,7 +57,6 @@ namespace Semmle.Extraction.CSharp.Standalone
var options = Options.Create(args);
// options.CIL = true; // To do: Enable this
using var output = new ConsoleLogger(options.Verbosity);
if (options.Help)
{
@@ -67,31 +67,33 @@ namespace Semmle.Extraction.CSharp.Standalone
if (options.Errors)
return 1;
var start = DateTime.Now;
var stopwatch = new Stopwatch();
stopwatch.Start();
output.Log(Severity.Info, "Running C# standalone extractor");
using var a = new Analysis(output, options);
using var logger = new ConsoleLogger(options.Verbosity);
logger.Log(Severity.Info, "Running C# standalone extractor");
using var a = new Analysis(logger, options);
var sourceFileCount = a.Extraction.Sources.Count;
if (sourceFileCount == 0)
{
output.Log(Severity.Error, "No source files found");
logger.Log(Severity.Error, "No source files found");
return 1;
}
if (!options.SkipExtraction)
{
using var fileLogger = new FileLogger(options.Verbosity, Extractor.GetCSharpLogPath());
using var fileLogger = Extractor.MakeLogger(options.Verbosity, false);
output.Log(Severity.Info, "");
output.Log(Severity.Info, "Extracting...");
logger.Log(Severity.Info, "");
logger.Log(Severity.Info, "Extracting...");
Extractor.ExtractStandalone(
a.Extraction.Sources,
a.References,
new ExtractionProgress(output),
new ExtractionProgress(logger),
fileLogger,
options);
output.Log(Severity.Info, $"Extraction completed in {DateTime.Now - start}");
logger.Log(Severity.Info, $"Extraction completed in {stopwatch.Elapsed}");
}
return 0;

13
csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
View File

@@ -69,6 +69,14 @@ namespace Semmle.Extraction.CSharp
Thread.CurrentThread.CurrentUICulture = culture;
}
public static ILogger MakeLogger(Verbosity verbosity, bool includeConsole)
{
var fileLogger = new FileLogger(verbosity, GetCSharpLogPath());
return includeConsole
? new CombinedLogger(new ConsoleLogger(verbosity), fileLogger)
: (ILogger)fileLogger;
}
/// <summary>
/// Command-line driver for the extractor.
/// </summary>
@@ -89,10 +97,7 @@ namespace Semmle.Extraction.CSharp
var options = Options.CreateWithEnvironment(args);
Entities.Compilation.Settings = (Directory.GetCurrentDirectory(), options.CompilerArguments.ToArray());
var fileLogger = new FileLogger(options.Verbosity, GetCSharpLogPath());
using var logger = options.Console
? new CombinedLogger(new ConsoleLogger(options.Verbosity), fileLogger)
: (ILogger)fileLogger;
using var logger = MakeLogger(options.Verbosity, options.Console);
if (Environment.GetEnvironmentVariable("SEMMLE_CLRTRACER") == "1" && !options.ClrTracer)
{