Changeset 8964 for trunk/sources

Timestamp:

11/28/12 12:11:42 (12 years ago)

Author:

ascheibe

Message:

#1986 fixed calling the shutdown command from a windows service

File:

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

trunk/sources/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;
@@ -456 +458 @@
       t.ContinueWith(c => {
         try {
-          Process.Start(SlaveCore.Properties.Settings.Default.ShutdownCommand);
+          //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) {