Merge pull request #3617 from chocolatey/master

(maint) Finish the 2.4.2 release by merging master to develop

Author: gep13

src/chocolatey.console/Program.cs

@@ -145,7 +145,23 @@ private static void Main(string[] args)
                 var traceAppenderName = "{0}LoggingColoredConsoleAppender".FormatWith(ChocolateyLoggers.Trace.ToStringSafe());
                 Log4NetAppenderConfiguration.EnableDebugLoggingIf(config.Debug, verboseAppenderName, traceAppenderName);
                 Log4NetAppenderConfiguration.EnableVerboseLoggingIf(config.Verbose, config.Debug, verboseAppenderName);
-                Log4NetAppenderConfiguration.EnableTraceLoggingIf(config.Trace, traceAppenderName);
+
+                if (config.Information.IsProcessElevated)
+                {
+                    Log4NetAppenderConfiguration.EnableTraceLoggingIf(config.Trace, traceAppenderName);
+                }
+                else
+                {
+                    var logger = ChocolateyLoggers.Normal;
+
+                    if (!config.RegularOutput)
+                    {
+                        logger = ChocolateyLoggers.LogFileOnly;
+                    }
+
+                    "chocolatey".Log().Warn(logger, "Usage of the --trace option is only allowed when running from an elevated session.");
+                }
+                
                 "chocolatey".Log().Debug(() => "{0} is running on {1} v {2}".FormatWith(ApplicationParameters.Name, config.Information.PlatformType, config.Information.PlatformVersion.ToStringSafe()));
                 //"chocolatey".Log().Debug(() => "Command Line: {0}".FormatWith(Environment.CommandLine));
 

src/chocolatey/GetChocolatey.cs

@@ -448,7 +448,15 @@ private T EnsureOriginalConfiguration<T>(IList<string> args, Func<ChocolateyConf
                 var traceAppenderName = "{0}LoggingColoredConsoleAppender".FormatWith(ChocolateyLoggers.Trace.ToStringSafe());
                 Log4NetAppenderConfiguration.EnableDebugLoggingIf(configuration.Debug, verboseAppenderName, traceAppenderName);
                 Log4NetAppenderConfiguration.EnableVerboseLoggingIf(configuration.Verbose, configuration.Debug, verboseAppenderName);
-                Log4NetAppenderConfiguration.EnableTraceLoggingIf(configuration.Trace, traceAppenderName);
+
+                var logger = ChocolateyLoggers.Normal;
+
+                if (!configuration.RegularOutput)
+                {
+                    logger = ChocolateyLoggers.LogFileOnly;
+                }
+
+                "chocolatey".Log().Warn(logger, "Usage of the --trace option is only allowed when running from an elevated session.");
             }
             finally
             {