diff --git a/src/System.Management.Automation/logging/MshLog.cs b/src/System.Management.Automation/logging/MshLog.cs index 5e9c554cb5..354da12f6b 100644 --- a/src/System.Management.Automation/logging/MshLog.cs +++ b/src/System.Management.Automation/logging/MshLog.cs @@ -134,54 +134,23 @@ namespace System.Management.Automation /// private static Collection CreateLogProvider(string shellId) { -#if V2 - try - { - Assembly crimsonAssembly = Assembly.Load(_crimsonLogProviderAssemblyName); - - if (crimsonAssembly != null) - { - LogProvider logProvider = (LogProvider)crimsonAssembly.CreateInstance(_crimsonLogProviderTypeName, - false, // don't ignore case - BindingFlags.CreateInstance, - null, // use default binder - null, - null, // use current culture - null // no special activation attributes - ); - - System.Diagnostics.Debug.Assert(logProvider != null); - return logProvider; - } - } - catch (FileNotFoundException e) - { - _trace.TraceException(e); - } - catch (BadImageFormatException e) - { - _trace.TraceException(e); - } - catch (SecurityException e) - { - _trace.TraceException(e); - } - catch (TargetInvocationException e) - { - _trace.TraceException(e); - } -#endif Collection providers = new Collection(); // Porting note: Linux does not support ETW -#if !UNIX + try { #if !CORECLR //TODO:CORECLR EventLogLogProvider not handled yet LogProvider eventLogLogProvider = new EventLogLogProvider(shellId); providers.Add(eventLogLogProvider); #endif + +#if UNIX + LogProvider sysLogProvider = new PSSysLogProvider(); + providers.Add(sysLogProvider); +#else LogProvider etwLogProvider = new PSEtwLogProvider(); providers.Add(etwLogProvider); +#endif return providers; } @@ -198,7 +167,7 @@ namespace System.Management.Automation // when running as non-admin user. In that case, we will default // to dummy log. } -#endif + providers.Add(new DummyLogProvider()); return providers; } diff --git a/src/System.Management.Automation/utils/tracing/SysLogProvider.cs b/src/System.Management.Automation/utils/tracing/SysLogProvider.cs index 03d5d17e9e..fc8a1e3da5 100755 --- a/src/System.Management.Automation/utils/tracing/SysLogProvider.cs +++ b/src/System.Management.Automation/utils/tracing/SysLogProvider.cs @@ -88,7 +88,7 @@ namespace System.Management.Automation.Tracing /// Initializes a new instance of this class. /// /// The log identity name used to identify the application in syslog. - /// The trace lavel to enable. + /// The trace level to enable. /// The keywords to enable. /// The output channels to enable. public SysLogProvider(string applicationId, PSLevel level, PSKeyword keywords, PSChannel channels)