Changeset 6945

Timestamp:

11/02/11 18:42:44 (13 years ago)

Author:

ascheibe

Message:

#1233 slave: catch more errors and log them to the windows event log

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/Program.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/HeuristicLab.Clients.Hive.Slave.TrayIcon-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewBase.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/ProjectInstaller.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.3/Core.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.3/Manager/EventLogManager.cs (added)
• HeuristicLab.Clients.Hive.Slave/3.3/SlaveClientCom.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.3/SlaveCommunicationService.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.3/SlaveTask.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/Program.cs

@@ -21 +21 @@
 
 using System;
+using System.Diagnostics;
 using System.Threading;
 
@@ -26 +27 @@
   public class Program {
     static void Main(string[] args) {
+      EventLog eventLog = null;
+      try {
+        if (!System.Diagnostics.EventLog.SourceExists("HLHive")) {
+          System.Diagnostics.EventLog.CreateEventSource("HLHive", "HiveSlave");
+        }
+        eventLog = new EventLog();
+        eventLog.Source = "HLHive";
+        eventLog.Log = "HiveSlave";
+      }
+      catch (Exception) { }
+
       //slave part
       Core core = new Core();
+      core.ServiceEventLog = eventLog;
       Console.WriteLine("Starting core ...");
       Thread coreThread = new Thread(core.Start);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/HeuristicLab.Clients.Hive.Slave.TrayIcon-3.3.csproj

@@ -37 +37 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <OutputPath>..\..\..\..\..\trunk\sources\bin\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
@@ -46 +46 @@
     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -112 +112 @@
       <Project>{8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}</Project>
       <Name>HeuristicLab.Clients.Hive.Slave.Views-3.3</Name>
-      <Private>False</Private>
+      <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Clients.Hive.Slave\3.3\HeuristicLab.Clients.Hive.Slave-3.3.csproj">
       <Project>{989FE92B-484E-41EE-87E2-6A24AF0381D8}</Project>
       <Name>HeuristicLab.Clients.Hive.Slave-3.3</Name>
-      <Private>False</Private>
+      <Private>True</Private>
     </ProjectReference>
   </ItemGroup>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewBase.cs

@@ -61 +61 @@
     #region Register Content Events
     protected override void DeregisterContentEvents() {
+      Content.CoreConnectionChanged -= new EventHandler<Common.EventArgs<CoreConnection>>(Content_CoreConnectionChanged);
       base.DeregisterContentEvents();
     }
@@ -66 +67 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
+      Content.CoreConnectionChanged += new EventHandler<Common.EventArgs<CoreConnection>>(Content_CoreConnectionChanged);
+    }
+
+    void Content_CoreConnectionChanged(object sender, Common.EventArgs<CoreConnection> e) {
+      if (e.Value == CoreConnection.Offline) {
+        Connector();
+      }
     }
     #endregion
@@ -77 +85 @@
         Content.UserVisibleMessageFired += new System.EventHandler<Common.EventArgs<string>>(Content_UserVisibleMessageFired);
         Task.Factory.StartNew(Connector);
+      } else {
+        Content.UserVisibleMessageFired -= new System.EventHandler<Common.EventArgs<string>>(Content_UserVisibleMessageFired);
       }
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/ProjectInstaller.cs

@@ -15 +15 @@
       base.OnAfterInstall(savedState);
 
+      //try to create an event log      
+      try {
+        if (!System.Diagnostics.EventLog.SourceExists("HLHive")) {
+          System.Diagnostics.EventLog.CreateEventSource("HLHive", "HiveSlave");
+        }
+      }
+      catch { }
+
       //try to start the service after installation
       using (var serviceController = new ServiceController(this.serviceInstaller1.ServiceName, Environment.MachineName)) {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs

@@ -71 +71 @@
     public void Start() {
       abortRequested = false;
+      EventLogManager.ServiceEventLog = ServiceEventLog;
 
       try {
@@ -90 +91 @@
       catch (Exception ex) {
         if (ServiceEventLog != null) {
-          try {
-            ServiceEventLog.WriteEntry(string.Format("Hive Slave threw exception: {0} with stack trace: {1}", ex.ToString(), ex.StackTrace), EventLogEntryType.Error);
-          }
-          catch (Exception) { }
+          EventLogManager.LogException(ex);
         } else {
           //try to log with clientCom. if this works the user sees at least a message, 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj

@@ -118 +118 @@
     <Compile Include="ExecutorQueue.cs" />
     <Compile Include="IPluginProvider.cs" />
+    <Compile Include="Manager\EventLogManager.cs" />
     <Compile Include="Manager\TaskManager.cs" />
     <Compile Include="Exceptions\OutOfCoresException.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/SlaveClientCom.cs

@@ -57 +57 @@
       }
       catch {
-        pipeFactory = new DuplexChannelFactory<ISlaveCommunication>(dummy, new NetNamedPipeBinding(), new EndpointAddress("net.pipe://localhost/HeuristicLabSlaveCom"));
+        EventLogManager.LogMessage("Couldn't create pipe for SlaveClientCom with config!");
+
+        try {
+          pipeFactory = new DuplexChannelFactory<ISlaveCommunication>(dummy, new NetNamedPipeBinding(), new EndpointAddress("net.pipe://localhost/HeuristicLabSlaveCom"));
+        }
+        catch {
+          EventLogManager.LogMessage("Couldn't create pipe for SlaveClientCom with fixed addresse!");
+          return;
+        }
       }
+      pipeFactory.Faulted += new System.EventHandler(pipeFactory_Faulted);
 
       ISlaveCommunication pipeProxy = pipeFactory.CreateChannel();
@@ -64 +73 @@
     }
 
+    void pipeFactory_Faulted(object sender, System.EventArgs e) {
+      EventLogManager.LogMessage("SlaveClientCom just faulted. Trying to repair it...");
+
+      try {
+        pipeFactory.Faulted -= new System.EventHandler(pipeFactory_Faulted);
+        SetupClientCom();
+      }
+      catch { }
+    }
+
     public static void Close() {
-      if (pipeFactory.State != CommunicationState.Closed)
+      if (pipeFactory.State != CommunicationState.Closed && pipeFactory.State != CommunicationState.Faulted)
         pipeFactory.Close();
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/SlaveCommunicationService.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.ServiceModel;
@@ -54 +55 @@
 
     public void LogMessage(string message) {
-      subscribers.ForEach(delegate(ISlaveCommunicationCallbacks callback) {
-        if (((ICommunicationObject)callback).State == CommunicationState.Opened) {
-          callback.OnMessageLogged(message);
-        } else {
-          subscribers.Remove(callback);
-        }
-      });
+      try {
+        subscribers.ForEach(delegate(ISlaveCommunicationCallbacks callback) {
+          if (((ICommunicationObject)callback).State == CommunicationState.Opened) {
+            callback.OnMessageLogged(message);
+          } else {
+            subscribers.Remove(callback);
+          }
+        });
+      }
+      catch (Exception ex) {
+        EventLogManager.LogException(ex);
+      }
     }
 
     public void StatusChanged(StatusCommons status) {
-      subscribers.ForEach(delegate(ISlaveCommunicationCallbacks callback) {
-        if (((ICommunicationObject)callback).State == CommunicationState.Opened) {
-          callback.OnStatusChanged(status);
-        } else {
-          subscribers.Remove(callback);
-        }
-      });
+      try {
+        subscribers.ForEach(delegate(ISlaveCommunicationCallbacks callback) {
+          if (((ICommunicationObject)callback).State == CommunicationState.Opened) {
+            callback.OnStatusChanged(status);
+          } else {
+            subscribers.Remove(callback);
+          }
+        });
+      }
+      catch (Exception ex) {
+        EventLogManager.LogException(ex);
+      }
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/SlaveTask.cs

@@ -51 +51 @@
 
     public TimeSpan ExecutionTime {
-      get { return executor != null ? executor.ExecutionTime : TimeSpan.Zero; }
+      get {
+        try {
+          return executor != null ? executor.ExecutionTime : TimeSpan.Zero;
+        }
+        catch (Exception ex) {
+          EventLogManager.LogException(ex);
+          return TimeSpan.Zero;
+        }
+      }
     }
 
@@ -122 +130 @@
 
       if (executor != null) {
-        executor.Dispose();
+        try {
+          executor.Dispose();
+        }
+        catch (Exception ex) {
+          EventLogManager.LogException(ex);
+        }
       }
 
@@ -155 +168 @@
 
     public TaskData GetTaskData() {
-      return executor.GetTaskData();
+      TaskData data = null;
+      try {
+        data = executor.GetTaskData();
+      }
+      catch (Exception ex) {
+        EventLogManager.LogException(ex);
+      }
+      return data;
     }