diff --git a/src/server/Dispatcher.cpp b/src/server/Dispatcher.cpp index cd3632d..45be95c 100644 --- a/src/server/Dispatcher.cpp +++ b/src/server/Dispatcher.cpp @@ -156,14 +156,15 @@ void Dispatcher::mkProcs(Dispatcher::PROC_QUEUE queue, DProcess *P){ void Dispatcher::ProcFinished(QString ID){ //Find the process with this ID and close it down (with proper events) - //qDebug() << " - Got Proc Finished Signal:" << ID; - bool found = false; + qDebug() << " - Got Proc Finished Signal:" << ID; + /*bool found = false; for(int i=0; i(i); if(HASH.contains(queue)){ QList list = HASH[queue]; for(int l=0; lID==ID){ + qDebug() << "Delete Proc on Finished:" << list[l]->ID; QJsonObject obj; obj.insert("log",list[l]->getProcLog()); obj.insert("success", list[l]->success ? "true" : "false" ); @@ -175,15 +176,17 @@ void Dispatcher::ProcFinished(QString ID){ list.takeAt(l)->deleteLater(); LogManager::log(LogManager::DISPATCH, obj); found = true; + l--; } } //end loop over queue list } - }//end loop over queue enumeration + }//end loop over queue enumeration*/ QTimer::singleShot(20,this, SLOT(CheckQueues()) ); } void Dispatcher::CheckQueues(){ -for(int i=0; i(i); if(HASH.contains(queue)){ QList list = HASH[queue]; @@ -191,6 +194,7 @@ for(int i=0; i0 && queue!=NO_QUEUE){ break; } //done with this - only first item in these queues should run at a time if( !list[j]->isRunning() ){ if(list[j]->isDone() ){ + qDebug() << "Delete Proc:" << list[j]->ID; QJsonObject obj; obj.insert("log",list[j]->getProcLog()); obj.insert("success", list[j]->success ? "true" : "false" ); diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp index 7c07961..6e5a30f 100644 --- a/src/server/WebBackend.cpp +++ b/src/server/WebBackend.cpp @@ -580,6 +580,7 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmIohyveRequest(const QJsonVal bool ok = false; if(keys.contains("action")){ QString act = JsonValueToString(in_args.toObject().value("action")); + //qDebug() << " - iohyve action:" << act; if(act=="create"){ ok = true; out->insert("create", sysadm::Iohyve::createGuest(in_args.toObject())); @@ -627,6 +628,7 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmIohyveRequest(const QJsonVal ok = true; out->insert("stop", sysadm::Iohyve::stopGuest(in_args.toObject())); } + //qDebug() << " - iohyve action finished:" << act << ok; } //end of "action" key usage //If nothing done - return the proper code