Fix service restart time, fix typo in UI, code cleanup

Author: CodeCasterNL

src/CodeCaster.PVBridge.ConfigurationUI.WinForms/ConfigurationForm.cs

@@ -77,7 +77,7 @@ private async void ConfigurationForm_Load(object sender, EventArgs e)
         {
             if (OurVersion != null)
             {
-                this.Text = $"PVBridve v{OurVersion} - Configuration";
+                this.Text = $"PVBridge v{OurVersion} - Configuration";
             }
 
             UpdateServiceStatus();
@@ -101,13 +101,8 @@ private async Task CheckForUpdatesAsync()
             var releaseClient = new GitHubReleaseClient(new HttpClient());
 
             var latestRelease = await releaseClient.GetLatestAsync();
-
-            if (latestRelease == null)
-            {
-                return;
-            }
-
-            var versionString = latestRelease.TagName;
+            
+            var versionString = latestRelease?.TagName;
 
             if (string.IsNullOrWhiteSpace(versionString) || !Version.TryParse(versionString[1..], out var version))
             {

src/CodeCaster.PVBridge.Service/CommandLine/WindowsServiceManager.cs

@@ -14,14 +14,22 @@ internal class WindowsServiceManager
     {
         private readonly ILogger<WindowsServiceManager> _logger;
 
+        // Windows Service restart timers after errors.
+        private const int FirstRestartSeconds = 60;
+        private const int SecondRestartSeconds = 60;
+        private const int SuccessiveRestartSeconds = 86400;
+
         /// <summary>
         /// Event Log name.
         /// </summary>
-        private const string applicationLogName = "Application";
+        private const string ApplicationLogName = "Application";
 
         // TODO: validate setter
         private string ServiceName { get; } = "PVBridge";
 
+        const string ServiceDisplayName = "PVBridge Solar Status Syncer";
+        const string ServiceUser = @"NT AUTHORITY\Network Service";
+
         public WindowsServiceManager(ILogger<WindowsServiceManager> logger, string? serviceName = null)
         {
             _logger = logger;
@@ -64,15 +72,15 @@ internal async Task InstallServiceAsync(IServiceProvider services, string servic
             {
                 if (!EventLog.SourceExists(Program.ApplicationName))
                 {
-                    _logger.LogInformation("Creating {application} log source {source}", applicationLogName, Program.ApplicationName);
+                    _logger.LogInformation("Creating {application} log source {source}", ApplicationLogName, Program.ApplicationName);
 
-                    EventLog.CreateEventSource(Program.ApplicationName, applicationLogName);
+                    EventLog.CreateEventSource(Program.ApplicationName, ApplicationLogName);
                 }
             }
             catch (Exception e)
             {
                 // That's not a fatal error.
-                _logger.LogError(e, "Creating {application} log source {source} failed", applicationLogName, Program.ApplicationName);
+                _logger.LogError(e, "Creating {application} log source {source} failed", ApplicationLogName, Program.ApplicationName);
             }
 
 
@@ -151,19 +159,16 @@ internal async Task UninstallServiceAsync(IServiceProvider services, Cancellatio
 
             var exitCode = await UninstallServiceAsync();
 
-            if (exitCode == 0)
-            {
-                return;
-            }
-            else if (exitCode == 5)
+            switch (exitCode)
             {
-                throw new InvalidOperationException($"The service \"{ServiceName}\" could not be uninstalled. Exit code: {exitCode}. Run as administrator.");
-            }
-            else
-            {
-
+                case 0:
+                    return;
+                // Access denied.
+                case 5:
+                    throw new InvalidOperationException($"The service \"{ServiceName}\" could not be uninstalled. Exit code: {exitCode}. Run as administrator.");
                 // User canceled or process failed, report that to the installer.
-                throw new InvalidOperationException($"The service \"{ServiceName}\" could not be uninstalled. Exit code: {exitCode}.");
+                default:
+                    throw new InvalidOperationException($"The service \"{ServiceName}\" could not be uninstalled. Exit code: {exitCode}.");
             }
         }
 
@@ -194,13 +199,9 @@ internal async Task UninstallServiceAsync(IServiceProvider services, Cancellatio
 
         private async Task<int> InstallServiceAsync(string servicePath)
         {
-
             var binPath = $"{servicePath} service run";
 
-            const string displayName = "PVBridge Solar Status Syncer";
-            const string serviceUser = @"NT AUTHORITY\Network Service";
-
-            var scArguments = $"create {ServiceName} displayName= \"{displayName}\" start= auto depend= RpcSs binPath= \"{binPath}\" obj= \"{serviceUser}\"";
+            var scArguments = $"create {ServiceName} displayName= \"{ServiceDisplayName}\" start= auto depend= RpcSs binPath= \"{binPath}\" obj= \"{ServiceUser}\"";
 
             var exitCode = await RunCreateServiceAsync(scArguments);
 
@@ -210,7 +211,9 @@ private async Task<int> InstallServiceAsync(string servicePath)
             }
 
             // Set failure mode: retry twice after 2 minutes, then after a day. Error count resets in a day.
-            scArguments = $"failure {ServiceName} reset= 86400 actions= restart/60000/restart/60000/restart/86400";
+            string restartActionString = $"restart/{FirstRestartSeconds * 1000}/restart/{SecondRestartSeconds * 1000}/restart/{SuccessiveRestartSeconds * 1000}";
+            
+            scArguments = $"failure {ServiceName} reset= 86400 actions= {restartActionString}";
 
             return await RunCreateServiceAsync(scArguments);
         }