Add option to execute custom command for service/app restart

zimbres · Nov 15, 2024 · ea3870a · ea3870a
1 parent b9858c7
commit ea3870a
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 19 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -30,7 +30,7 @@ jobs:
           tag=$(git describe --tags --abbrev=0)
           release_name="ServiceMonitor-$tag-${{ matrix.target }}"
 
-          dotnet publish src/ServiceMonitor/ServiceMonitor.csproj --framework net8.0 --runtime "${{ matrix.target }}" --no-self-contained -p:PublishSingleFile=true -c Release -o "$release_name"
+          dotnet publish src/ServiceMonitor/ServiceMonitor.csproj --framework net8.0 --runtime "${{ matrix.target }}" --no-self-contained -p:PublishSingleFile=false -c Release -o "$release_name"
 
           if [ "${{ matrix.target }}" == "win-x64" ]; then
             7z a -tzip "${release_name}.zip" "./${release_name}/*"

diff --git a/src/ServiceMonitor/Configurations/Configuration.cs b/src/ServiceMonitor/Configurations/Configuration.cs
@@ -6,11 +6,12 @@ internal class Configuration
     public List<Service> Services { get; set; }
 }
 
-internal class Service
+public class Service
 {
     public string ServiceName { get; set; }
     public string IpAddress { get; set; }
     public int Port { get; set; }
     public string HttpUrl { get; set; }
     public string WordToCheck { get; set; }
+    public string CustomCommand { get; set; }
 }
diff --git a/src/ServiceMonitor/GlobalSuppressions.cs b/src/ServiceMonitor/GlobalSuppressions.cs
@@ -5,5 +5,4 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-//[assembly: SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>", Scope = "member", Target = "~M:ServiceMonitor.Worker.RestartService(System.String)")]
-[assembly: SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>", Scope = "member", Target = "~M:ServiceMonitor.Services.ControlService.RestartService(System.String)")]
+[assembly: SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>", Scope = "member", Target = "~M:ServiceMonitor.Services.ControlService.RestartService(ServiceMonitor.Configurations.Service)")]
diff --git a/src/ServiceMonitor/GlobalUsings.cs b/src/ServiceMonitor/GlobalUsings.cs
@@ -1,6 +1,7 @@
 global using ServiceMonitor;
 global using ServiceMonitor.Configurations;
 global using ServiceMonitor.Services;
+global using System.Management.Automation;
 global using System.Net.Sockets;
 global using System.Reflection;
 global using System.ServiceProcess;

diff --git a/src/ServiceMonitor/ServiceMonitor.csproj b/src/ServiceMonitor/ServiceMonitor.csproj
@@ -7,7 +7,7 @@
     <UserSecretsId>dotnet-ServiceMonitor-02b8361b-7a93-472d-a2d6-7b2e8f7973af</UserSecretsId>
     <AssemblyVersion>$(PackageVersion)</AssemblyVersion>
     <FileVersion>$(PackageVersion)</FileVersion>
-    <Version>2.0.0.2</Version>
+    <Version>3.0.0.1</Version>
     <ApplicationIcon>service.ico</ApplicationIcon>
     <Copyright>Zimbres.COM</Copyright>
   </PropertyGroup>
@@ -17,9 +17,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
+    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.6" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
   </ItemGroup>
 </Project>
diff --git a/src/ServiceMonitor/Services/ControlService.cs b/src/ServiceMonitor/Services/ControlService.cs
@@ -9,30 +9,39 @@ public ControlService(ILogger<ControlService> logger)
         _logger = logger;
     }
 
-    public void RestartService(string serviceName)
+    public void RestartService(Service service)
     {
         try
         {
-            using var serviceController = new ServiceController(serviceName);
+            if (service.CustomCommand != null)
+            {
+                using PowerShell powerShell = PowerShell.Create();
+                powerShell.AddScript(service.CustomCommand);
+                var processes = powerShell.Invoke();
+                _logger.LogWarning("Custom command '{service.CustomCommand}' executed.", service.CustomCommand);
+                return;
+            }
+
+            using var serviceController = new ServiceController(service.ServiceName);
             if (serviceController.Status == ServiceControllerStatus.Stopped)
             {
-                _logger.LogWarning("Starting service {serviceName}...", serviceName);
+                _logger.LogWarning("Starting service {serviceName}...", service.ServiceName);
                 serviceController.Start();
             }
-            
+
             else if (serviceController.Status == ServiceControllerStatus.Running)
             {
-                _logger.LogWarning("Restarting service {serviceName}...", serviceName);
+                _logger.LogWarning("Restarting service {serviceName}...", service.ServiceName);
                 serviceController.Stop();
                 serviceController.WaitForStatus(ServiceControllerStatus.Stopped, TimeSpan.FromSeconds(60));
                 serviceController.Start();
             }
-            
+
             if (serviceController.Status == ServiceControllerStatus.StopPending)
             {
-                _logger.LogWarning("Waiting service {serviceName} to stop...", serviceName);
+                _logger.LogWarning("Waiting service {serviceName} to stop...", service.ServiceName);
                 serviceController.WaitForStatus(ServiceControllerStatus.Stopped, TimeSpan.FromSeconds(60));
-                _logger.LogWarning("Starting service {serviceName}...", serviceName);
+                _logger.LogWarning("Starting service {serviceName}...", service.ServiceName);
                 serviceController.Start();
             }
             serviceController.WaitForStatus(ServiceControllerStatus.Running, TimeSpan.FromSeconds(60));

diff --git a/src/ServiceMonitor/Worker.cs b/src/ServiceMonitor/Worker.cs
@@ -43,15 +43,15 @@ private async Task ProcessService(Service service)
         {
             if (!_tcpService.CheckTcpPortListening(service.IpAddress, service.Port))
             {
-                _controlService.RestartService(service.ServiceName);
+                _controlService.RestartService(service);
             }
         }
 
         if (service.HttpUrl is not null)
         {
             if (!await _httpService.CheckHttpAsync(service.HttpUrl, service.WordToCheck))
             {
-                _controlService.RestartService(service.ServiceName);
+                _controlService.RestartService(service);
             }
         }
     }

diff --git a/src/ServiceMonitor/appsettings.json b/src/ServiceMonitor/appsettings.json
@@ -13,6 +13,12 @@
         "IpAddress": "127.0.0.1",
         "Port": 8080
       },
+      {
+        "ServiceName": "SMTP",
+        "IpAddress": "127.0.0.1",
+        "Port": 25,
+        "CustomCommand": "dir"
+      },
       {
         "ServiceName": "YourServiceName",
         "HttpUrl": "http://localhost:3000/api/health",