github
/
winsw
mirror of https://github.com/winsw/winsw
1
0
Fork 0
Code Issues Releases Wiki Activity

Generalize top-level logging. All exceptions will be written to loggers

pull/143/head
Oleg Nenashev 2016-12-03 15:40:20 +01:00
parent 641adb4e0a
commit 871afa0f2c
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Core/ServiceWrapper/Main.cs
View File

@ -513,11 +513,13 @@ namespace winsw
} }
catch (WmiException e) catch (WmiException e)
{ {
Log.Fatal("WMI Operation failure: " + e.ErrorCode, e);
Console.Error.WriteLine(e); Console.Error.WriteLine(e);
return (int)e.ErrorCode; return (int)e.ErrorCode;
} }
catch (Exception e) catch (Exception e)
{ {
Log.Fatal("Unhandled exception", e);
Console.Error.WriteLine(e); Console.Error.WriteLine(e);
return -1; return -1;
} }
@ -528,17 +530,29 @@ namespace winsw
throw new WmiException(ReturnValue.NoSuchService); throw new WmiException(ReturnValue.NoSuchService);
} }
// ReSharper disable once InconsistentNaming // ReSharper disable once InconsistentNaming
/// <summary>
/// Runs the wrapper.
/// </summary>
/// <param name="_args">Arguments. If empty, WinSW will behave in the service mode. Otherwise - CLI mode</param>
/// <param name="descriptor">Service descriptor. If null, it will be initialized within the method.
/// In such case configs will be loaded from the XML Configuration File.</param>
/// <exception cref="Exception">Any unhandled exception</exception>
public static void Run(string[] _args, ServiceDescriptor descriptor = null) public static void Run(string[] _args, ServiceDescriptor descriptor = null)
{ {
bool isCLIMode = _args.Length > 0; bool isCLIMode = _args.Length > 0;
// If descriptor is not specified, initialize the new one (and load configs from there)
var d = descriptor ?? new ServiceDescriptor(); var d = descriptor ?? new ServiceDescriptor();
// Configure the wrapper-internal logging // Configure the wrapper-internal logging.
// STDIN and STDOUT of the child process will be handled independently // STDIN and STDOUT of the child process will be handled independently.
InitLoggers(d, isCLIMode); InitLoggers(d, isCLIMode);
if (isCLIMode) // CLI mode
if (isCLIMode) // CLI mode, in-service mode otherwise
{ {
Log.Debug("Starting ServiceWrapper in CLI mode"); Log.Debug("Starting ServiceWrapper in CLI mode");