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.

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

[Fleet Installer] Don't throw when deleting registry value if it's already deleted #6672

Merged
Merged
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion tracer/src/Datadog.FleetInstaller/RegistryHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public static bool RemoveCrashTrackingKey(ILogger log, TracerValues values, stri
try
{
var key = Registry.LocalMachine.OpenSubKey(registryKeyName, writable: true);
key?.DeleteValue(crashHandlerPath);
key?.DeleteValue(crashHandlerPath, throwOnMissingValue: false);
log.WriteInfo($"Crash tracking handler path '{crashHandlerPath}' removed from '{registryKeyName}'");

return true;
Expand Down Expand Up @@ -83,6 +83,8 @@ public static bool TryGetIisVersion(ILogger log, [NotNullWhen(true)] out Version
var minor = key.GetValue("MinorVersion") as int? ?? 0;

version = new(major: major, minor: minor);

log.WriteInfo($"Found IIS version: '{major}.{minor}'");
return true;
}
catch (Exception ex)
Expand Down
Loading