Changeset 3931 for branches/3.2/sources/HeuristicLab.Hive.Server.Console

Timestamp:

06/19/10 09:17:24 (14 years ago)

Author:

kgrading

Message:

added minor speedups and better transaction handling to the server (#828)

Location:

branches/3.2/sources/HeuristicLab.Hive.Server.Console/3.2

Files:

• HeuristicLab.Hive.Server.Console-3.2.csproj (modified) (1 diff)
• HiveServerManagementConsole.cs (modified) (4 diffs)

branches/3.2/sources/HeuristicLab.Hive.Server.Console/3.2/HeuristicLab.Hive.Server.Console-3.2.csproj

@@ -217 +217 @@
       <Name>HeuristicLab.PluginInfrastructure</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Tracing\3.2\HeuristicLab.Tracing-3.2.csproj">
+      <Project>{EE2034D9-6E27-48A1-B855-42D45F69A4FC}</Project>
+      <Name>HeuristicLab.Tracing-3.2</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/3.2/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.cs

@@ -33 +33 @@
 using System.Threading;
 using System.ServiceModel;
+using HeuristicLab.Tracing;
 
 namespace HeuristicLab.Hive.Server.ServerConsole {
@@ -263 +264 @@
         IJobManager jobManager =
           ServiceLocator.GetJobManager();
-        jobs = jobManager.GetAllJobs();
-
-        lvJobControl.Items.Clear();
+        if (jobManager == null) {
+          Logger.Error("Jobmanager is null");
+          jobs = new ResponseList<JobDto>();
+        } else {
+          jobs = jobManager.GetAllJobs();
+        }
+
+
+        if (lvJobControl != null) lvJobControl.Items.Clear();
 
         ListViewGroup lvJobCalculating = new ListViewGroup("calculating", HorizontalAlignment.Left);
@@ -311 +318 @@
       }
       catch (Exception ex) {
+        Logger.Error(ex);
         closeFormEvent(true, true);
         this.Close();
@@ -790 +798 @@
     }
 
-    private int CapacityRam(int noCores, int freeCores) {
+    private int CapacityRam(int noCores, int freeCores) {    
       if (noCores > 0) {
         int capacity = ((noCores - freeCores) / noCores) * 100;