From c747d1f44c30a1c229e9c0b8f8a8be73ba1437da Mon Sep 17 00:00:00 2001
From: Ken Moore <moorekou@gmail.com>
Date: Fri, 29 Jan 2016 10:11:18 -0500
Subject: [PATCH] Commit some more work on finishing up the new Dispatcher.

---
 src/server/Dispatcher.cpp | 18 ++++++++++++++++--
 src/server/Dispatcher.h   |  4 ++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/server/Dispatcher.cpp b/src/server/Dispatcher.cpp
index d5ac4a1..411edb9 100644
--- a/src/server/Dispatcher.cpp
+++ b/src/server/Dispatcher.cpp
@@ -26,10 +26,15 @@ DProcess::~DProcess(){
 }
   
 void DProcess::startProc(){
-  if(cmds.isEmpty()){ emit ProcFinished(ID); return; }
+  if(cmds.isEmpty()){ 
+    finished = QDateTime::currentDateTime();
+    emit ProcFinished(ID); 
+    return; 
+  }
   QString cmd = cmds.takeFirst();
   success = false; //not finished yet
   if(!proclog.isEmpty()){ proclog.append("\n"); }
+  else{ started = QDateTime::currentDateTime(); } //first cmd started
   proclog.append("[Running Command: "+cmd+" ]");
   this->start(cmd);
 }
@@ -58,6 +63,7 @@ void DProcess::cmdFinished(int ret, QProcess::ExitStatus status){
     }else{
       proclog.append("\n[Command Failed: Process Crashed ]");
     }
+    finished = QDateTime::currentDateTime();
     emit ProcFinished(ID);
   }
 }
@@ -123,7 +129,15 @@ void Dispatcher::ProcFinished(QString ID){
       bool found = false;
       for(int l=0; l<list.length() && !found; l++){
         if(list[l].ID==ID){ 
-		
+	  QJsonObject obj;
+	  obj.insert("log",list[l].procLog());
+	  obj.insert("success", list[l].success ? "true" : "false" );
+	  obj.insert("proc_id", ID);
+	  obj.insert("cmd_list", QJsonArray::fromStringList( list[l].rawcmds );
+	  obj.insert("time_started", list[l].started.toString(QT::ISODate) );
+	  obj.insert("time_finished", list[l].finished.toString(QT::ISODate) );
+	  delete list.takeAt(l);
+	  LogManager::log(LogManager::EV_DISPATCH, obj);
 	  found = true;
 	}
       } //end loop over queue list
diff --git a/src/server/Dispatcher.h b/src/server/Dispatcher.h
index ac95445..19d5af1 100644
--- a/src/server/Dispatcher.h
+++ b/src/server/Dispatcher.h
@@ -19,7 +19,11 @@ public:
 	
 	QString ID;
 	QStringList cmds;
+
+	//output variables for logging purposes
 	bool success;
+	QDateTime started, finished;
+	QStringList rawcmds; //copy of cmds at start of process
 
 	void startProc();