Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gep13 wants to merge 3 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c50e4b
(#3604) Don't allow trace logging when no elevated
gep13 Jan 22, 2025
0cd5ffd
Merge pull request #3606 from gep13/issue-3604
corbob Jan 22, 2025
c6e2f21
Merge pull request #3610 from chocolatey/hotfix/2.4.2
AdmiringWorm Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/chocolatey.console/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
10 changes: 9 additions & 1 deletion src/chocolatey/GetChocolatey.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Loading