From 81099b2bdcbe2145572a6136765a616ec3a53359 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Wed, 4 Nov 2015 18:02:01 +0100
Subject: [PATCH] vectoconsole: add switch for engineering mode, adapt logging
rules
---
VectoConsole/App.config | 2 +-
VectoConsole/Program.cs | 16 ++++++++++++++--
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/VectoConsole/App.config b/VectoConsole/App.config
index 6fcb136b5b..80528cfc83 100644
--- a/VectoConsole/App.config
+++ b/VectoConsole/App.config
@@ -19,7 +19,7 @@
layout="${longdate} [${processid}:${threadid}@${machinename}] ${callsite} ${level:uppercase=true}: ${message}" />
</targets>
<rules>
- <logger name="*" minlevel="Info" writeTo="LogFile" />
+ <logger name="*" minlevel="Warn" writeTo="LogFile" />
</rules>
</nlog>
</configuration>
\ No newline at end of file
diff --git a/VectoConsole/Program.cs b/VectoConsole/Program.cs
index 2a3b1eb21c..69a3f06d8f 100644
--- a/VectoConsole/Program.cs
+++ b/VectoConsole/Program.cs
@@ -30,6 +30,7 @@ Description:
FILE1.vecto [FILE2.vecto ...]: A list of vecto-job files (with the extension: .vecto). At least one file must be given. Delimited by whitespace.
-t: output information about execution times
-mod: write mod-data in addition to sum-data
+ -eng: switch to engineering mode (implies -mod)
-v: Shows verbose information (errors and warnings will be displayed)
-vv: Shows more verbose information (infos will be displayed)
-vvv: Shows debug messages (slow!)
@@ -101,10 +102,18 @@ Examples:
var sumWriter = new SummaryFileWriter(sumFileName);
var jobContainer = new JobContainer(sumWriter);
+ var mode = SimulatorFactory.FactoryMode.DeclarationMode;
+ if (args.Contains("-eng")) {
+ mode = SimulatorFactory.FactoryMode.EngineeringMode;
+ Console.ForegroundColor = ConsoleColor.White;
+ Console.WriteLine("Switching to Engineering Mode. Make sure the job-file is saved in engineering mode!");
+ Console.ResetColor();
+ }
+
Console.WriteLine("Reading Job Files");
stopWatch.Start();
foreach (var file in fileList.Where(f => Path.GetExtension(f) == Constants.FileExtensions.VectoJobFile)) {
- var runsFactory = new SimulatorFactory(SimulatorFactory.FactoryMode.DeclarationMode, file);
+ var runsFactory = new SimulatorFactory(mode, file);
if (args.Contains("-mod")) {
runsFactory.WriteModalResults = true;
}
@@ -147,7 +156,10 @@ Examples:
}
} catch (Exception e) {
Console.Error.WriteLine(e.Message);
- Trace.TraceError(e.ToString());
+ //Trace.TraceError(e.ToString());
+ Console.ForegroundColor = ConsoleColor.Red;
+ Console.Error.WriteLine("Please see log-file for further details (logs/log.txt)");
+ Console.ResetColor();
Environment.ExitCode = Environment.ExitCode != 0 ? Environment.ExitCode : 1;
}
return Environment.ExitCode;
--
GitLab