Skip to content
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

Jump to bottom

(#933) Remove duplicate output from console and Chocolatey GUI logs #954

Draft
wants to merge 4 commits into
base: develop
Choose a base branch
from
+9 −25
Draft

(#933) Remove duplicate output from console and Chocolatey GUI logs #954

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6524dbf
(#933) Don't double-log.
corbob Aug 25, 2022
88d5fb0
(#933) Re-use chocolatey that we already have
corbob Aug 25, 2022
36f12a8
(#933) Reuse chocolatey for all the instances
corbob Aug 26, 2022
7663a79
Set verbosity, remove capture of current config since Set overrides i…
corbob Sep 3, 2022
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
34 changes: 9 additions & 25 deletions Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,13 @@ public async Task<PackageOperationResult> InstallPackage(
using (await Lock.WriteLockAsync())
{
var logger = new SerilogLogger(Logger, _progressService);
var choco = Lets.GetChocolatey(initializeLogging: false).SetCustomLogging(logger, logExistingMessages: false, addToExistingLoggers: true);
choco.Set(
_choco.Set(
config =>
{
config.CommandName = CommandNameType.install.ToString();
config.PackageNames = id;
config.Features.UsePackageExitCodes = false;
config.Verbose = true;

if (version != null)
{
Expand Down Expand Up @@ -238,22 +238,7 @@ public async Task<PackageOperationResult> InstallPackage(
config.DownloadChecksumType64 = advancedInstallOptions.DownloadChecksumType64bit;
}
});

Action<LogMessage> grabErrors;
var errors = GetErrors(out grabErrors);

using (logger.Intercept(grabErrors))
{
await choco.RunAsync();

if (Environment.ExitCode != 0)
{
Environment.ExitCode = 0;
return new PackageOperationResult { Successful = false, Messages = errors.ToArray() };
}

return PackageOperationResult.SuccessfulCached;
}
return await RunCommand(_choco, logger);
}
}

Expand Down Expand Up @@ -351,21 +336,21 @@ public async Task<PackageOperationResult> UninstallPackage(string id, string ver
using (await Lock.WriteLockAsync())
{
var logger = new SerilogLogger(Logger, _progressService);
var choco = Lets.GetChocolatey(initializeLogging: false).SetCustomLogging(logger, logExistingMessages: false, addToExistingLoggers: true);
choco.Set(
_choco.Set(
config =>
{
config.CommandName = CommandNameType.uninstall.ToString();
config.PackageNames = id;
config.Features.UsePackageExitCodes = false;
config.Verbose = true;

if (version != null)
{
config.Version = version.ToString();
}
});

return await RunCommand(choco, logger);
return await RunCommand(_choco, logger);
}
}

Expand All @@ -374,16 +359,15 @@ public async Task<PackageOperationResult> UpdatePackage(string id, Uri source =
using (await Lock.WriteLockAsync())
{
var logger = new SerilogLogger(Logger, _progressService);
var choco = Lets.GetChocolatey(initializeLogging: false).SetCustomLogging(logger, logExistingMessages: false, addToExistingLoggers: true);
choco.Set(
_choco.Set(
config =>
{
config.CommandName = CommandNameType.upgrade.ToString();
config.PackageNames = id;
config.Features.UsePackageExitCodes = false;
config.Verbose = true;
});

return await RunCommand(choco, logger);
return await RunCommand(_choco, logger);
}
}

Expand Down