Changeset 2588

Timestamp:

01/04/10 22:47:22 (15 years ago)

Author:

kgrading

Message:

added logging (#826)

File:

• trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Core.cs (modified) (17 diffs)

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Core.cs

@@ -102 +102 @@
       //Rly?!
       while (!abortRequested) {
-        MessageContainer container = queue.GetMessage();
-        Debug.WriteLine("Main loop received this message: " + container.Message.ToString());
-        Logging.Instance.Info(this.ToString(), container.Message.ToString());
+        MessageContainer container = queue.GetMessage();        
         DetermineAction(container);
       }
@@ -114 +112 @@
     /// </summary>
     /// <param name="container">The Container, containing the message</param>
-    private void DetermineAction(MessageContainer container) {           
+    private void DetermineAction(MessageContainer container) {
+      Logging.Instance.Info(this.ToString(), "Message: " + container.Message.ToString() + " for job: " + container.JobId);        
       switch (container.Message) {
         //Server requests to abort a job
-        case MessageContainer.MessageType.AbortJob:
+        case MessageContainer.MessageType.AbortJob:          
           if(engines.ContainsKey(container.JobId))
             engines[container.JobId].Abort();
@@ -127 +126 @@
 
         case MessageContainer.MessageType.JobAborted:          
-        //todo: thread this
-          Debug.WriteLine("Job aborted, he's dead");
+        //todo: thread this          
           lock (engines) {            
             Guid jobId = new Guid(container.JobId.ToString());
@@ -145 +143 @@
         
         //Request a Snapshot from the Execution Engine
-        case MessageContainer.MessageType.RequestSnapshot:
+        case MessageContainer.MessageType.RequestSnapshot:          
           if (engines.ContainsKey(container.JobId)) 
             engines[container.JobId].RequestSnapshot();
@@ -154 +152 @@
         
         //Snapshot is ready and can be sent back to the Server
-        case MessageContainer.MessageType.SnapshotReady:
+        case MessageContainer.MessageType.SnapshotReady:          
           ThreadPool.QueueUserWorkItem(new WaitCallback(GetSnapshot), container.JobId);          
           break;
@@ -160 +158 @@
         
         //Pull a Job from the Server
-        case MessageContainer.MessageType.FetchJob:
+        case MessageContainer.MessageType.FetchJob:          
           if (!currentlyFetching) {
             wcfService.SendJobAsync(ConfigManager.Instance.GetClientInfo().Id);
             currentlyFetching = true;
-          }          
+          } else
+            Logging.Instance.Info(this.ToString(), "Currently fetching, won't fetch this time!");
           break;          
         
         
         //A Job has finished and can be sent back to the server
-        case MessageContainer.MessageType.FinishedJob:
+        case MessageContainer.MessageType.FinishedJob:          
           ThreadPool.QueueUserWorkItem(new WaitCallback(GetFinishedJob), container.JobId);          
           break;     
@@ -218 +217 @@
     /// <param name="jobId"></param>
     private void GetFinishedJob(object jobId) {
-      Guid jId = (Guid)jobId;      
+      Guid jId = (Guid)jobId;
+      Logging.Instance.Info(this.ToString(), "Getting the finished job with id: " + jId);
       try {
         if (!engines.ContainsKey(jId)) {
@@ -228 +228 @@
 
         if (WcfService.Instance.ConnState == NetworkEnum.WcfConnState.Loggedin) {
+          Logging.Instance.Info(this.ToString(), "Sending the finished job with id: " + jId);
           wcfService.StoreFinishedJobResultAsync(ConfigManager.Instance.GetClientInfo().Id,
             jId,
@@ -235 +236 @@
             true);
         } else {
+          Logging.Instance.Info(this.ToString(), "Storing the finished job with id: " + jId + " to hdd");
           JobStorageManager.PersistObjectToDisc(wcfService.ServerIP, wcfService.ServerPort, jId, sJob);
           lock (engines) {
@@ -251 +253 @@
 
     private void GetSnapshot(object jobId) {
+      Logging.Instance.Info(this.ToString(), "Fetching a snapshot for job " + jobId);
       Guid jId = (Guid)jobId;
       byte[] obj = engines[jId].GetSnapshot();
+      Logging.Instance.Info(this.ToString(), "BEGIN: Sending snapshot sync");
       wcfService.ProcessSnapshotSync(ConfigManager.Instance.GetClientInfo().Id,
         jId,
@@ -258 +262 @@
         engines[jId].Progress,
         null);
-
+      Logging.Instance.Info(this.ToString(), "END: Sended snapshot sync");
       //Uptime Limit reached, now is a good time to destroy this jobs.
       if (!UptimeManager.Instance.isOnline()) {
@@ -267 +271 @@
       
       } else {
+        Logging.Instance.Info(this.ToString(), "Restarting the job" + jobId);
         engines[jId].StartOnlyJob();
       }
@@ -294 +299 @@
     /// <param name="e"></param>
     void wcfService_SendJobCompleted(object sender, SendJobCompletedEventArgs e) {
+      Logging.Instance.Info(this.ToString(), "Received new job with id " + e.Result.Job.Id);
       if (e.Result.StatusMessage != ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT) {        
         bool sandboxed = false;
         List<byte[]> files = new List<byte[]>();
+        Logging.Instance.Info(this.ToString(), "Fetching plugins for job " + e.Result.Job.Id);
         foreach (CachedHivePluginInfo plugininfo in PluginCache.Instance.GetPlugins(e.Result.Job.PluginsNeeded))
           files.AddRange(plugininfo.PluginFiles);
-
+        Logging.Instance.Info(this.ToString(), "Plugins fetched for job " + e.Result.Job.Id);
         AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, null, files);
         appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
@@ -306 +313 @@
             jobs.Add(e.Result.Job.Id, e.Result.Job);
             appDomains.Add(e.Result.Job.Id, appDomain);
-
+            Logging.Instance.Info(this.ToString(), "Creating AppDomain");
             Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
+            Logging.Instance.Info(this.ToString(), "Created AppDomain");
             engine.JobId = e.Result.Job.Id;
-            engine.Queue = MessageQueue.GetInstance();            
+            engine.Queue = MessageQueue.GetInstance();
+            Logging.Instance.Info(this.ToString(), "Starting Engine for job " + e.Result.Job.Id);
             engine.Start(e.Data);
             engines.Add(e.Result.Job.Id, engine);
@@ -318 +327 @@
           }
         }        
-      }
+      } else
+        Logging.Instance.Info(this.ToString(), "No more jobs left!");
       currentlyFetching = false;
     }
@@ -328 +338 @@
     /// <param name="e"></param>
     void wcfService_StoreFinishedJobResultCompleted(object sender, StoreFinishedJobResultCompletedEventArgs e) {
+      Logging.Instance.Info(this.ToString(), "Job submitted with id " + e.Result.JobId);
       KillAppDomain(e.Result.JobId);
       if (e.Result.Success) {            
@@ -408 +419 @@
     /// <param name="id">the GUID of the job</param>
     private void KillAppDomain(Guid id) {
+      Logging.Instance.Info(this.ToString(), "Shutting down Appdomain for Job " + id);
       lock (engines) {
         try {