Changeset 6199 for branches

Timestamp:

05/15/11 14:33:42 (14 years ago)

Author:

cneumuel

Message:

#1233

• fixed synchronization issues with logging

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/RefreshableHiveExperiment.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/RefreshableHiveExperiment.cs

@@ -101 +101 @@
       set { log = value; }
     }
+    private static object logLocker = new object();
     
 
@@ -188 +189 @@
 
           if (!hiveJob.IsFinishedJobDownloaded && !hiveJob.IsDownloading && hiveJob.Job.LastJobDataUpdate < lightweightJob.LastJobDataUpdate) {
-            log.LogMessage(string.Format("Downloading job {0}", lightweightJob.Id));
+            LogMessage(string.Format("Downloading job {0}", lightweightJob.Id));
             hiveJob.IsDownloading = true;
             jobDownloader.DownloadJob(hiveJob.Job, (localJob, itemJob, exception) => {
-              log.LogMessage(string.Format("Finished downloading job {0}", localJob.Id));
+              LogMessage(string.Format("Finished downloading job {0}", localJob.Id));
               HiveJob localHiveJob = GetHiveJobById(localJob.Id);
 
               if (exception != null) {
-                log.LogException(exception);
+                var ex = new ConcurrentJobDownloaderException("Downloading job failed.", exception);
+                LogException(ex);
                 localHiveJob.IsDownloading = false;
-                throw new ConcurrentJobDownloaderException("Downloading job failed.", exception);
+                throw ex;
               }
 
@@ -232 +234 @@
     }
 
+    // synchronized logging
+    private void LogException(Exception exception) {
+      lock (logLocker) {
+        log.LogException(exception);
+      }
+    }
+    // synchronized logging
+    private void LogMessage(string message) {
+      lock (logLocker) {
+        log.LogMessage(message);
+      }
+    }
+
     public HiveJob GetHiveJobById(Guid jobId) {
       foreach (HiveJob job in hiveExperiment.HiveJobs) {