Allow to configure service

Author: uholeschak

Tools/Psdz/PsdzRpcClient/Program.cs

@@ -355,7 +355,7 @@ static async Task<int> Main(string[] args)
                 }
 
                 PsdzRpcServerStarter serverStarter = new(Console.Out);
-                bool connected = await serverStarter.ConnectClient(serverExe, ProcessWindowStyle.Minimized, client, cts, userName, password).ConfigureAwait(false);
+                bool connected = await serverStarter.ConnectClient(serverExe, null, ProcessWindowStyle.Minimized, client, cts, userName, password).ConfigureAwait(false);
                 if (!connected)
                 {
                     if (_verbosity >= Options.VerbosityOption.Error)

Tools/Psdz/PsdzRpcClientLibrary/PsdzRpcServerStarter.cs

@@ -22,10 +22,10 @@ public PsdzRpcServerStarter(TextWriter output = null)
         _output = output;
     }
 
-    public async Task<bool> ConnectClient(string serverExe, ProcessWindowStyle windowStyle, PsdzRpcClient client, CancellationTokenSource cts,
+    public async Task<bool> ConnectClient(string serverExe, string serviceName, ProcessWindowStyle windowStyle, PsdzRpcClient client, CancellationTokenSource cts,
             string userName = null, string password = null)
     {
-        if (!StartServerIfNeeded(serverExe, windowStyle, userName, password))
+        if (!StartServerIfNeeded(serverExe, serviceName, windowStyle, userName, password))
         {
             _output?.WriteLine("No server available. Exiting.");
             return false;
@@ -44,7 +44,7 @@ public async Task<bool> ConnectClient(string serverExe, ProcessWindowStyle windo
             }
 
             _output?.WriteLine("Try to restart server...");
-            if (!StartServerIfNeeded(serverExe, windowStyle, userName, password))
+            if (!StartServerIfNeeded(serverExe, serviceName, windowStyle, userName, password))
             {
                 _output?.WriteLine("No server available. Exiting.");
                 return false;
@@ -72,7 +72,7 @@ public bool IsPipeAvailable()
     /// Startet den Server-Prozess, falls ein Pfad angegeben ist.
     /// Wartet nur bis der Prozess gestartet ist, nicht bis die Pipe verfügbar ist.
     /// </summary>
-    public bool StartServerIfNeeded(string serverExe, ProcessWindowStyle windowStyle, string userName, string password)
+    public bool StartServerIfNeeded(string serverExe, string serviceName, ProcessWindowStyle windowStyle, string userName, string password)
     {
         if (IsPipeAvailable())
         {
@@ -81,7 +81,7 @@ public bool StartServerIfNeeded(string serverExe, ProcessWindowStyle windowStyle
         }
 
         // Zuerst versuchen den Windows-Dienst zu starten
-        if (TryStartWindowsService("PsdzRpcServer"))
+        if (TryStartWindowsService(serviceName))
         {
             return true;
         }
@@ -94,6 +94,11 @@ private bool TryStartWindowsService(string serviceName)
     {
         try
         {
+            if (String.IsNullOrEmpty(serviceName))
+            {
+                return false;
+            }
+
             using ServiceController sc = new ServiceController(serviceName);
             ServiceControllerStatus status = sc.Status;
 

Tools/Psdz/WebPsdzClient/App_Data/SessionContainer.cs

@@ -648,7 +648,7 @@ public SessionContainer(string sessionId, string dealerId)
             try
             {
                 Cts = new CancellationTokenSource();
-                bool connected = Task.Run(() => serverStarter.ConnectClient(Global.RpcServer, ProcessWindowStyle.Hidden, RpcClient, Cts)).GetAwaiter().GetResult();
+                bool connected = Task.Run(() => serverStarter.ConnectClient(Global.RpcServer, Global.RpcServiceName, ProcessWindowStyle.Hidden, RpcClient, Cts)).GetAwaiter().GetResult();
                 log.InfoFormat("ConnectClient result: {0}", connected);
 
                 if (!connected)

Tools/Psdz/WebPsdzClient/Global.asax.cs

@@ -29,6 +29,7 @@ public class Global : HttpApplication
         public static string IstaFolder { get; private set; }
 #if USE_RPC_CLIENT
         public static string RpcServer { get; private set; }
+        public static string RpcServiceName { get; private set; }
 #endif
         public static string SqlServer { get; private set; }
         public static string TestLicenses { get; private set; }
@@ -44,6 +45,7 @@ protected void Application_Start(object sender, EventArgs e)
             IstaFolder = ConfigurationManager.AppSettings["IstaFolder"];
 #if USE_RPC_CLIENT
             RpcServer = ConfigurationManager.AppSettings["RpcServer"];
+            RpcServiceName = ConfigurationManager.AppSettings["RpcServiceName"];
 #endif
             SqlServer = ConfigurationManager.AppSettings["SqlServer"];
             TestLicenses = ConfigurationManager.AppSettings["TestLicenses"];
@@ -56,9 +58,9 @@ protected void Application_Start(object sender, EventArgs e)
 
 #if USE_RPC_CLIENT
 #if !DEBUG
-            if (string.IsNullOrEmpty(RpcServer) || !File.Exists(RpcServer))
+            if (string.IsNullOrEmpty(RpcServiceName))
             {
-                RpcServer = PsdzRpcClient.PsdzRpcServerStarter.GetProgramsServerLocation();
+                RpcServiceName = "PsdzRpcServer";
             }
 #endif
             if (string.IsNullOrEmpty(RpcServer) || !File.Exists(RpcServer))