Changeset 7135

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

Location:

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

Files:

• Properties/Settings.Designer.cs (modified) (1 diff)
• Properties/Settings.settings (modified) (1 diff)
• SlaveCmdsWithKill.cs (modified) (2 diffs)
• SlaveItem.cs (modified) (1 diff)
• SlaveMainViewBase.cs (modified) (3 diffs)
• app.config (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/Properties/Settings.Designer.cs

@@ -71 +71 @@
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("00:00:20")]
+        public global::System.TimeSpan ServiceStartStopTimeout {
+            get {
+                return ((global::System.TimeSpan)(this["ServiceStartStopTimeout"]));
+            }
+            set {
+                this["ServiceStartStopTimeout"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("00:00:03")]
+        public global::System.TimeSpan ServiceReconnectTimeout {
+            get {
+                return ((global::System.TimeSpan)(this["ServiceReconnectTimeout"]));
+            }
+            set {
+                this["ServiceReconnectTimeout"] = value;
+            }
+        }
     }
 }

trunk/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/Properties/Settings.settings

@@ -15 +15 @@
       <Value Profile="(Default)">HeuristicLab.Clients.Hive.Slave</Value>
     </Setting>
+    <Setting Name="ServiceStartStopTimeout" Type="System.TimeSpan" Scope="User">
+      <Value Profile="(Default)">00:00:20</Value>
+    </Setting>
+    <Setting Name="ServiceReconnectTimeout" Type="System.TimeSpan" Scope="User">
+      <Value Profile="(Default)">00:00:03</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

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());
       }
     }

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

@@ -91 +91 @@
     public bool ReconnectToSlaveCore() {
       try {
+        DeregisterEvents();
         pipeProxy = pipeFactory.CreateChannel();
         StatusCommons st = pipeProxy.Subscribe();
         if (st != null) {
+          RegisterEvents();
           OnStatusChanged(st);
           return true;

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

@@ -62 +62 @@
     protected override void DeregisterContentEvents() {
       Content.CoreConnectionChanged -= new EventHandler<Common.EventArgs<CoreConnection>>(Content_CoreConnectionChanged);
+      Content.SlaveDisplayStateChanged -= new EventHandler<Common.EventArgs<SlaveDisplayStat>>(Content_SlaveDisplayStateChanged);
       base.DeregisterContentEvents();
     }
@@ -68 +69 @@
       base.RegisterContentEvents();
       Content.CoreConnectionChanged += new EventHandler<Common.EventArgs<CoreConnection>>(Content_CoreConnectionChanged);
+      Content.SlaveDisplayStateChanged += new EventHandler<Common.EventArgs<SlaveDisplayStat>>(Content_SlaveDisplayStateChanged);
+    }
+
+    void Content_SlaveDisplayStateChanged(object sender, Common.EventArgs<SlaveDisplayStat> e) {
+      if (e.Value == SlaveDisplayStat.NoService) {
+        Task.Factory.StartNew(Connector);
+      }
     }
 
     void Content_CoreConnectionChanged(object sender, Common.EventArgs<CoreConnection> e) {
       if (e.Value == CoreConnection.Offline) {
-        Connector();
+        Task.Factory.StartNew(Connector);
       }
     }
@@ -119 +127 @@
 
         if (!connected) {
-          Thread.Sleep(1000);
+          Thread.Sleep(Settings.Default.ServiceReconnectTimeout);
         }
       }

trunk/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/app.config

@@ -20 +20 @@
                 <value>HeuristicLab.Clients.Hive.Slave</value>
             </setting>
+            <setting name="ServiceStartStopTimeout" serializeAs="String">
+                <value>00:00:20</value>
+            </setting>
+            <setting name="ServiceReconnectTimeout" serializeAs="String">
+                <value>00:00:03</value>
+            </setting>
         </HeuristicLab.Clients.Hive.SlaveCore.Views.Properties.Settings>
     </userSettings>