Changeset 9215 for branches/OaaS/HeuristicLab.Services.Hive

Timestamp:

02/11/13 10:15:52 (11 years ago)

Author:

fschoepp

Message:

#1888:

• Janitor is now working as expected in Windows Azure
• Added basic support for experiments (draggable experiments)
• Added methods to save/read experiments from TableStorage
• The job status can now be retrieved by using the GetTasks/GetTaskData methods
• Added a class to convert JSON-objects to Algorithm instances
• Web page: Added experiment button to navigation

Location:

branches/OaaS/HeuristicLab.Services.Hive/3.3

Files:

• HiveDao.cs (modified) (2 diffs)
• HiveJanitor.cs (modified) (3 diffs)

branches/OaaS/HeuristicLab.Services.Hive/3.3/HiveDao.cs

@@ -28 +28 @@
 using HeuristicLab.Services.Hive.Interfaces;
 using System.Data.Common;
+using System.Configuration;
 
 namespace HeuristicLab.Services.Hive.DataAccess {
@@ -34 +35 @@
     public HiveDataContext CreateContext(bool longRunning = false) {
       //var context = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString);
-      var context = new HiveDataContext(provider.GetOpenConnection(Settings.Default.HiveConnectionStringName));      
+      HiveDataContext context;
+      if (ConfigurationManager.ConnectionStrings[Settings.Default.HiveConnectionStringName] == null) {
+        context = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString);
+      }
+      else {
+        context = new HiveDataContext(provider.GetOpenConnection(Settings.Default.HiveConnectionStringName));
+      }
       if (longRunning) context.CommandTimeout = (int)Settings.Default.LongRunningDatabaseCommandTimeout.TotalSeconds;
       return context;

branches/OaaS/HeuristicLab.Services.Hive/3.3/HiveJanitor.cs

@@ -23 +23 @@
 using System.Threading;
 using HeuristicLab.Services.Hive.DataAccess;
+using System.Diagnostics;
 
 namespace HeuristicLab.Services.Hive {
@@ -55 +56 @@
         try {
           LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: starting cleanup");
+          Trace.WriteLine("HiveJanitor: starting cleanup");
           bool cleanup = false;
           DateTime lastCleanup = DateTime.MinValue;
@@ -70 +72 @@
           }
           LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: cleanup finished");
+          Trace.WriteLine("HiveJanitor: cleanup finished");
         }
         catch (Exception e) {
           LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log(string.Format("HiveJanitor: The following exception occured: {0}", e.ToString()));
+          Trace.WriteLine(string.Format("HiveJanitor: The following exception occured: {0}", e.ToString()));
         }
         waitHandle.WaitOne(HeuristicLab.Services.Hive.Properties.Settings.Default.CleanupInterval);