Changeset 7135 for trunk/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsWithKill.cs

Timestamp:

12/06/11 14:30:47 (13 years ago)

Author:

ascheibe

Message:

#1672 some fixes for the slave tray ui:

• removed some more magic numbers
• fixed reconnecting to windows service when it was stopped
• added more time for stopping/starting windows service so that no exception is thrown because of a timeout

File:

• trunk/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsWithKill.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsWithKill.cs

@@ -126 +126 @@
 
     private void StartService() {
-      TimeSpan timeout = TimeSpan.FromMilliseconds(5000);
-
       ServiceController service = new ServiceController(serviceName);
       try {
         if (service.Status == ServiceControllerStatus.Running) {
           service.Stop();
-          service.WaitForStatus(ServiceControllerStatus.Stopped, timeout);
+          service.WaitForStatus(ServiceControllerStatus.Stopped, Settings.Default.ServiceStartStopTimeout);
         }
 
         service.Start();
-        service.WaitForStatus(ServiceControllerStatus.Running, timeout);
+        service.WaitForStatus(ServiceControllerStatus.Running, Settings.Default.ServiceStartStopTimeout);
       }
       catch (InvalidOperationException ex) {
@@ -147 +145 @@
 
     private void StopService() {
-      TimeSpan timeout = TimeSpan.FromMilliseconds(7000);
-
       ServiceController service = new ServiceController(serviceName);
       try {
         if (service.Status == ServiceControllerStatus.Running) {
           service.Stop();
-          service.WaitForStatus(ServiceControllerStatus.Stopped, timeout);
+          service.WaitForStatus(ServiceControllerStatus.Stopped, Settings.Default.ServiceStartStopTimeout);
         }
       }
       catch (InvalidOperationException ex) {
-        MessageBox.Show("Error starting service: Hive Slave Service not found!" + Environment.NewLine + ex.ToString());
+        MessageBox.Show("Error stopping service: Hive Slave Service not found!" + Environment.NewLine + ex.ToString());
       }
       catch (Exception ex) {
-        MessageBox.Show("Error starting service, exception is: " + Environment.NewLine + ex.ToString());
+        MessageBox.Show("Error stopping service, exception is: " + Environment.NewLine + ex.ToString());
       }
     }