PowerShell · daxian-dbw · Nov 6, 2017 · Oct 13, 2017 · Oct 13, 2017 · Oct 13, 2017
diff --git a/src/System.Management.Automation/CoreCLR/CorePsStub.cs b/src/System.Management.Automation/CoreCLR/CorePsStub.cs
@@ -783,29 +783,6 @@ public static Guid GetActivityId()
         }
     }
 
-    internal static class PSEtwLog
-    {
-        static internal void LogAnalyticError(PSEventId id, PSOpcode opcode, PSTask task, PSKeyword keyword, params object[] args) { }
-        static internal void LogAnalyticWarning(PSEventId id, PSOpcode opcode, PSTask task, PSKeyword keyword, params object[] args) { }
-        static internal void LogAnalyticVerbose(PSEventId id, PSOpcode opcode, PSTask task, PSKeyword keyword,
-            Int64 objectId,
-            Int64 fragmentId,
-            int isStartFragment,
-            int isEndFragment,
-            UInt32 fragmentLength,
-            PSETWBinaryBlob fragmentData)
-        { }
-        static internal void LogAnalyticVerbose(PSEventId id, PSOpcode opcode, PSTask task, PSKeyword keyword, params object[] args) { }
-        static internal void SetActivityIdForCurrentThread(Guid newActivityId) { }
-        static internal void LogOperationalVerbose(PSEventId id, PSOpcode opcode, PSTask task, PSKeyword keyword, params object[] args) { }
-        static internal void LogOperationalWarning(PSEventId id, PSOpcode opcode, PSTask task, PSKeyword keyword, params object[] args) { }
-        static internal void ReplaceActivityIdForCurrentThread(Guid newActivityId, PSEventId eventForOperationalChannel, PSEventId eventForAnalyticChannel, PSKeyword keyword, PSTask task) { }
-        static internal void LogOperationalError(PSEventId id, PSOpcode opcode, PSTask task, PSKeyword keyword, params object[] args) { }
-        static internal void LogOperationalError(PSEventId id, PSOpcode opcode, PSTask task, LogContext logContext, string payLoad) { }
-        static internal void LogAnalyticInformational(PSEventId id, PSOpcode opcode, PSTask task, PSKeyword keyword, params object[] args) { }
-        static internal void LogOperationalInformation(PSEventId id, PSOpcode opcode, PSTask task, PSKeyword keyword, params object[] args) { }
-    }
-
     public enum PowerShellTraceTask
     {
         /// <summary>

diff --git a/src/System.Management.Automation/CoreCLR/EventResource.cs b/src/System.Management.Automation/CoreCLR/EventResource.cs
@@ -119,6 +119,7 @@
     <Compile Remove="utils\perfCounters\PSPerfCountersMgr.cs" />
     <Compile Remove="gen\CoreMshSnapinResources.cs" />
     <Compile Remove="gen\ErrorPackageRemoting.cs" />
+    <Compile Remove="gen\EventResource.cs" />
 
     <EmbeddedResource Remove="resources\CoreMshSnapinResources.resx" />
     <EmbeddedResource Remove="resources\ErrorPackageRemoting.resx" />

diff --git a/src/System.Management.Automation/engine/PropertyAccessor.cs b/src/System.Management.Automation/engine/PropertyAccessor.cs
@@ -9,6 +9,7 @@
 using System.Threading;
 
 using System.Management.Automation;
+using System.Management.Automation.Internal;
 using Microsoft.Win32;
 
 using Newtonsoft.Json;
@@ -101,6 +102,51 @@ internal enum PropertyScope
         internal abstract string GetDefaultSourcePath();
         internal abstract void SetDefaultSourcePath(string defaultPath);
 
+#if UNIX
+        /// <summary>
+        /// Gets the application identity (name) to use for writing to syslog.
+        /// </summary>
+        /// <returns>
+        /// The string identity to use for writing to syslog.
+        /// <para>
+        /// The default value is 'powershell'
+        /// </para>
+        /// </returns>
+        internal abstract string GetSysLogIdentity();
+
+        /// <summary>
+        /// Gets the log level filter.
+        /// </summary>
+        /// <returns>One of the PSLevel values indicating the level to log.
+        /// <para>
+        /// The default value is PSLevel.Informational
+        /// </para>
+        /// </returns>
+        internal abstract PSLevel GetLogLevel();
+
+        /// <summary>
+        /// Gets the bitmask of the PSChannel values to log.
+        /// </summary>
+        /// <returns>
+        /// A bitmask of PSChannel.Operational and/or PSChannel.Analytic
+        /// <para>
+        /// The default value is PSChannel.Operational
+        /// </para>
+        /// </returns>
+        internal abstract PSChannel GetLogChannels();
+
+        /// <summary>
+        /// Gets the bitmask of keywords to log.
+        /// </summary>
+        /// <returns>
+        /// A bitmask of PSKeyword values.
+        /// <para>
+        /// The default value is all keywords other than UseAlwaysAnalytic
+        /// </para>
+        /// </returns>
+        internal abstract PSKeyword GetLogKeywords();
+
+#endif // UNIX
         #endregion // Interface Methods
     }
 
@@ -310,6 +356,155 @@ internal override void SetDefaultSourcePath(string defaultPath)
             WriteValueToFile<string>(fileName, "DefaultSourcePath", defaultPath);
         }
 
+#if UNIX
+        /// <summary>
+        /// Gets the identity name to use for writing to syslog.
+        /// </summary>
+        /// <returns>
+        /// The string identity to use for writing to syslog.
+        /// <para>
+        /// The default value is 'powershell'.
+        /// </para>
+        /// </returns>
+        internal override string GetSysLogIdentity()
+        {
+            string fileName = Path.Combine(psHomeConfigDirectory, configFileName);
+            string identity = ReadValueFromFile<string>(fileName, "LogIdentity");
+
+            if (string.IsNullOrEmpty(identity) ||
+                identity.Equals(LogDefaultValue, StringComparison.OrdinalIgnoreCase))
+            {
+                identity = "powershell";
+            }
+            return identity;
+        }
+
+        /// <summary>
+        /// Gets the log level filter.
+        /// </summary>
+        /// <returns>One of the PSLevel values indicating the level to log.
+        /// <para>
+        /// The default value is PSLevel.Informational.
+        /// </para>
+        /// </returns>
+        internal override PSLevel GetLogLevel()
+        {
+            string fileName = Path.Combine(psHomeConfigDirectory, configFileName);
+            string levelName = ReadValueFromFile<string>(fileName, "LogLevel");
+            PSLevel level;
+
+            if (string.IsNullOrEmpty(levelName) ||
+                levelName.Equals(LogDefaultValue, StringComparison.OrdinalIgnoreCase) ||
+                !Enum.TryParse<PSLevel>(levelName, true, out level))
+            {
+                level = PSLevel.Informational;
+            }
+            return level;
+        }
+
+        /// <summary>
+        /// The supported separator characters for listing channels and keywords in configuration.
+        /// </summary>
+        static readonly char[] s_valueSeparators = new char[] {' ', ',', '|'};
+
+        /// <summary>
+        /// Provides a string name to indicate the default for a configuration setting.
+        /// </summary>
+        const string LogDefaultValue = "default";
+
+        const PSChannel DefaultChannels = PSChannel.Operational;
+
+        /// <summary>
+        /// Gets the bitmask of the PSChannel values to log.
+        /// </summary>
+        /// <returns>
+        /// A bitmask of PSChannel.Operational and/or PSChannel.Analytic.
+        /// <para>
+        /// The default value is PSChannel.Operational.
+        /// </para>
+        /// </returns>
+        internal override PSChannel GetLogChannels()
+        {
+            string fileName = Path.Combine(psHomeConfigDirectory, configFileName);
+            string values = ReadValueFromFile<string>(fileName, "LogChannels");
+
+            PSChannel result = 0;
+            if (!string.IsNullOrEmpty(values))
+            {
+                string[] names = values.Split(s_valueSeparators, StringSplitOptions.RemoveEmptyEntries);
+
+                foreach (string name in names)
+                {
+                    if (name.Equals(LogDefaultValue, StringComparison.OrdinalIgnoreCase))
+                    {
+                        result = 0;
+                        break;
+                    }
+
+                    PSChannel value;
+                    if (Enum.TryParse<PSChannel>(name, true, out value))
+                    {
+                        result |= value;
+                    }
+                }
+            }
+
+            if (result == 0)
+            {
+                result = DefaultChannels;
+            }
+
+            return result;
+        }
+
+        // by default, do not include analytic events.
+        const PSKeyword DefaultKeywords = (PSKeyword) (0xFFFFFFFFFFFFFFFF & ~(ulong)PSKeyword.UseAlwaysAnalytic);
+
+        /// <summary>
+        /// Gets the bitmask of keywords to log.
+        /// </summary>
+        /// <returns>
+        /// A bitmask of PSKeyword values.
+        /// <para>
+        /// The default value is all keywords other than UseAlwaysAnalytic.
+        /// </para>
+        /// </returns>
+        internal override PSKeyword GetLogKeywords()
+        {
+            string fileName = Path.Combine(psHomeConfigDirectory, configFileName);
+            string values = ReadValueFromFile<string>(fileName, "LogKeywords");
+
+            PSKeyword result = 0;
+            if (!string.IsNullOrEmpty(values))
+            {
+                string[] names = values.Split(s_valueSeparators, StringSplitOptions.RemoveEmptyEntries);
+
+                foreach (string name in names)
+                {
+                    if (name.Equals(LogDefaultValue, StringComparison.OrdinalIgnoreCase))
+                    {
+                        result = 0;
+                        break;
+                    }
+
+                    PSKeyword value;
+                    if (Enum.TryParse<PSKeyword>(name, true, out value))
+                    {
+                        result |= value;
+                    }
+                }
+            }
+
+            if (result == 0)
+            {
+                result = DefaultKeywords;
+            }
+
+            return result;
+        }
+
+#endif // UNIX
+
         private T ReadValueFromFile<T>(string fileName, string key)
         {
             fileLock.EnterReadLock();

@@ -9,6 +9,7 @@ namespace System.Management.Automation.Internal
     /// <summary>
     /// Defines enumerations for the keywords
     /// </summary>
+    [Flags]
     internal enum PSKeyword : ulong
     {
         Runspace = 0x1,
@@ -194,6 +195,7 @@ internal enum PSEventId : int
     /// <summary>
     /// Defines enumerations for channels
     /// </summary>
+    [Flags]
     internal enum PSChannel : byte
     {
         Operational = 0x10,