Changeset 8971 for branches/RuntimeOptimizer/HeuristicLab.Clients.Hive.Slave

Timestamp:

11/29/12 09:57:15 (12 years ago)

Author:

abeham

Message:

#1985: Synchronized with trunk

Location:

branches/RuntimeOptimizer

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Slave/3.3/Core.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.Designer.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.settings (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.3/app.config (modified) (1 diff)

branches/RuntimeOptimizer/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs

@@ -22 +22 @@
 using System;
 using System.Diagnostics;
+using System.IO;
+using System.Reflection;
 using System.ServiceModel;
 using System.Threading;
 using System.Threading.Tasks;
-using HeuristicLab.Clients.Hive.SlaveCore.Properties;
-using HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -54 +54 @@
 
     public Core() {
-      var log = new ThreadSafeLog(Settings.Default.MaxLogCount);
+      var log = new ThreadSafeLog(SlaveCore.Properties.Settings.Default.MaxLogCount);
       this.pluginManager = new PluginManager(WcfService.Instance, log);
       this.taskManager = new TaskManager(pluginManager, log);
@@ -76 +76 @@
         slaveComm = new ServiceHost(typeof(SlaveCommunicationService));
         slaveComm.Open();
-        
+
         // delete all left over task directories
         pluginManager.CleanPluginTemp();
@@ -96 +96 @@
         }
         ShutdownCore();
-      } finally {
+      }
+      finally {
         DeregisterServiceEvents();
         waitShutdownSem.Release();
@@ -185 +186 @@
             HeartbeatManager.Interval = TimeSpan.FromSeconds(interval);
           }
+          break;
+        case MessageContainer.MessageType.ShutdownComputer:
+          ShutdownComputer();
           break;
       }
@@ -450 +454 @@
     }
 
+    private void ShutdownComputer() {
+      var t = TS.Task.Factory.StartNew(new Action(Shutdown));
+      t.ContinueWith(c => {
+        try {
+          //we assume that *.exe means an executable in the current directory, otherwise it is a command
+          if (SlaveCore.Properties.Settings.Default.ShutdownCommand.EndsWith(".exe")) {
+            string dirName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            Process.Start(Path.Combine(dirName, SlaveCore.Properties.Settings.Default.ShutdownCommand));
+          } else {
+            Process.Start(SlaveCore.Properties.Settings.Default.ShutdownCommand);
+          }
+        }
+        catch (Exception ex) {
+          if (ServiceEventLog != null) {
+            EventLogManager.LogException(ex);
+          } else
+            throw ex;
+        }
+      });
+    }
+
     /// <summary>
     /// complete shutdown, should be called before the the application is exited

branches/RuntimeOptimizer/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.Designer.cs

@@ -2 +2 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.530
+//     Runtime Version:4.0.30319.586
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -311 +311 @@
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("shutdown.exe")]
+        public string ShutdownCommand {
+            get {
+                return ((string)(this["ShutdownCommand"]));
+            }
+            set {
+                this["ShutdownCommand"] = value;
+            }
+        }
     }
 }

branches/RuntimeOptimizer/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.settings

@@ -75 +75 @@
       <Value Profile="(Default)">-1</Value>
     </Setting>
+    <Setting Name="ShutdownCommand" Type="System.String" Scope="User">
+      <Value Profile="(Default)">shutdown.exe</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

branches/RuntimeOptimizer/HeuristicLab.Clients.Hive.Slave/3.3/app.config

@@ -122 +122 @@
         <value>-1</value>
       </setting>
+      <setting name="ShutdownCommand" serializeAs="String">
+        <value>shutdown.exe</value>
+      </setting>
     </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
   </userSettings>