Changeset 4772 for branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HiveSlaveConsole.cs

Timestamp:

11/11/10 15:30:03 (13 years ago)

Author:

cneumuel

Message:

#1260

• added LogServiceReader to display log for slave without writing to local files
• aborted jobs with childjobs now got back to state WaitForChildJob (instead of Offline)
• lifecyclemanager now knows about available plugins (does not yet work perfectly)

File:

• branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HiveSlaveConsole.cs (modified) (4 diffs)

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HiveSlaveConsole.cs

@@ -51 +51 @@
     private static bool isfired = false;
     //the logfilereader
-    private LogFileReader logFileReader;
+    private ILogReader logFileReader;
 
     //communication with the slave
@@ -103 +103 @@
 
     private void InitLogFileReader() {
-      logFileReader = new LogFileReader(AppDomain.CurrentDomain.BaseDirectory + @"/Hive.Slave.log");
-      logFileReader.MoreData += new LogFileReader.MoreDataHandler(logFileReader_MoreData);
+      //logFileReader = new LogFileReader(AppDomain.CurrentDomain.BaseDirectory + @"/Hive.Slave.log");
+      logFileReader = new LogServiceReader(slaveCommunicator);
+      logFileReader.MoreData += new MoreDataHandler(logFileReader_MoreData);
       logFileReader.Start();
     }
@@ -406 +407 @@
 
     private void btnSaveCal_Click(object sender, EventArgs e) {
-      slaveCommunicator.SetUptimeCalendarAsync(onlineTimes.ToArray());
+      slaveCommunicator.SetUptimeCalendarAsync(onlineTimes);
     }
 
@@ -488 +489 @@
             curJobStatusItem = new ListViewItem(curJob.JobId.ToString());
             curJobStatusItem.SubItems.Add(curJob.Since.ToString());
-            progress = curJob.Progress * 100;
-            curJobStatusItem.SubItems.Add(progress.ToString());
             lvJobDetail.Items.Add(curJobStatusItem);
           }