diff --git a/src/rc.d/sysadm b/src/rc.d/sysadm index b7b2d8e..5ca2a55 100755 --- a/src/rc.d/sysadm +++ b/src/rc.d/sysadm @@ -48,7 +48,7 @@ sysadm_start() ssl_keygen echo "Starting sysadm..." command="/usr/local/bin/sysadm-server" - daemon -p /var/run/sysadm.pid $command $flags >/dev/null 2>/dev/null + daemon -r -p /var/run/sysadm.pid $command $flags >/dev/null 2>/dev/null chmod 744 /var/run/sysadm.pid >/dev/null 2>/dev/null } diff --git a/src/server/Dispatcher.cpp b/src/server/Dispatcher.cpp index 2e2855a..4cf02a3 100644 --- a/src/server/Dispatcher.cpp +++ b/src/server/Dispatcher.cpp @@ -7,6 +7,7 @@ #include "globals.h" + // ================================ // DProcess Class (Internal) // ================================ @@ -95,6 +96,7 @@ void DProcess::updateLog(){ // Dispatcher Class // ================================ Dispatcher::Dispatcher(){ + qRegisterMetaType("Dispatcher::PROC_QUEUE"); connect(this, SIGNAL(mkprocs(Dispatcher::PROC_QUEUE, DProcess*)), this, SLOT(mkProcs(Dispatcher::PROC_QUEUE, DProcess*)) ); } @@ -127,8 +129,8 @@ DProcess* Dispatcher::queueProcess(Dispatcher::PROC_QUEUE queue, QString ID, QSt //For multi-threading, need to emit a signal/slot for this action (object creations need to be in same thread as parent) qDebug() << "Queue Process:" << queue << ID << cmds; DProcess *P = createProcess(ID, cmds); - connect(this, SIGNAL(mkProcs(Dispatcher::PROC_QUEUE, DProcess*)), this, SLOT(mkProcs(Dispatcher::PROC_QUEUE, DProcess*)) ); - emit mkProcs(queue, P); + //connect(this, SIGNAL(mkprocs(Dispatcher::PROC_QUEUE, DProcess*)), this, SLOT(mkProcs(Dispatcher::PROC_QUEUE, DProcess*)) ); + emit mkprocs(queue, P); return P; } diff --git a/src/server/Dispatcher.h b/src/server/Dispatcher.h index 3b067ad..2d3683d 100644 --- a/src/server/Dispatcher.h +++ b/src/server/Dispatcher.h @@ -95,4 +95,4 @@ signals: }; -#endif \ No newline at end of file +#endif diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp index 2504392..6e9f09d 100644 --- a/src/server/WebBackend.cpp +++ b/src/server/WebBackend.cpp @@ -585,13 +585,9 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmIohyveRequest(const QJsonVal if(act=="fetchiso"){ ok = true; DProcess fetchproc; - qDebug() << "Before fetchiso"; out->insert("fetchiso", sysadm::Iohyve::fetchISO(in_args.toObject(), &fetchproc)); - //qDebug() << "fetchProc: " << fetchproc; - qDebug() << "After fetchiso"; connect(&fetchproc, SIGNAL(ProcessOutput(QString)), this, SLOT(slotIohyveFetchProcessOutput(QString)) ); connect(&fetchproc, SIGNAL(Finished(QString, int, QString)), this, SLOT(slotIohyveFetchDone(QString, int, QString)) ); - qDebug() << "After fetchiso again"; } if(act=="install"){ ok = true;