[Feature] Minor changes to make ScriptBlock logging work with SysLog

daxian-dbw · daxian-dbw · commit a6c62bfc5823 · 2018-01-04T13:40:51.000-08:00
diff --git a/src/System.Management.Automation/utils/tracing/SysLogProvider.cs b/src/System.Management.Automation/utils/tracing/SysLogProvider.cs
@@ -313,6 +313,13 @@ public void SetActivity(Guid activity)
         /// <param name="args">The payload for the log message.</param>
         public void Log(PSEventId eventId, PSChannel channel, PSTask task, PSOpcode opcode, PSLevel level, PSKeyword keyword, params object[] args)
         {
+            if (keyword == PSKeyword.UseAlwaysAnalytic)
+            {
+                // Use the 'DefaultKeywords' to work around the default keyword filter.
+                // Note that the PSKeyword argument is not really used in writing SysLog.
+                keyword = PSSysLogProvider.DefaultKeywords;
+            }
+
             if (ShouldLog(level, keyword, channel))
             {
                 int threadId = Thread.CurrentThread.ManagedThreadId;
diff --git a/test/csharp/test_PSConfiguration.cs b/test/csharp/test_PSConfiguration.cs
@@ -33,6 +33,12 @@ public PowerShellPolicyFixture()
             systemWideConfigDirectory = Utils.DefaultPowerShellAppBase;
             currentUserConfigDirectory = Utils.GetUserConfigurationDirectory();
 
+            if (!Directory.Exists(currentUserConfigDirectory))
+            {
+                // Create the CurrentUser config directory if it doesn't exist
+                Directory.CreateDirectory(currentUserConfigDirectory);
+            }
+
             systemWideConfigFile = Path.Combine(systemWideConfigDirectory, "PowerShellProperties.json");
             currentUserConfigFile = Path.Combine(currentUserConfigDirectory, "PowerShellProperties.json");
 

Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,13 @@ public void SetActivity(Guid activity)`
`313`	`313`	`/// <param name="args">The payload for the log message.</param>`
`314`	`314`	`public void Log(PSEventId eventId, PSChannel channel, PSTask task, PSOpcode opcode, PSLevel level, PSKeyword keyword, params object[] args)`
`315`	`315`	`{`
	`316`	`+ if (keyword == PSKeyword.UseAlwaysAnalytic)`
	`317`	`+ {`
	`318`	`+ // Use the 'DefaultKeywords' to work around the default keyword filter.`
	`319`	`+ // Note that the PSKeyword argument is not really used in writing SysLog.`
	`320`	`+ keyword = PSSysLogProvider.DefaultKeywords;`
	`321`	`+ }`
	`322`	`+`
`316`	`323`	`if (ShouldLog(level, keyword, channel))`
`317`	`324`	`{`
`318`	`325`	`int threadId = Thread.CurrentThread.ManagedThreadId;`