diff --git a/src/server/AuthorizationManager.cpp b/src/server/AuthorizationManager.cpp index 269879c..83133ba 100644 --- a/src/server/AuthorizationManager.cpp +++ b/src/server/AuthorizationManager.cpp @@ -47,7 +47,7 @@ void AuthorizationManager::clearAuth(QString token){ if(token.isEmpty() || token.length() < TOKENLENGTH){ return; } //not a valid token //clear an authorization token QString id = hashID(token); - qDebug() << "Clear Auth:" << id; + //qDebug() << "Clear Auth:" << id; if(!id.isEmpty()){ HASH.remove(id); } } @@ -289,7 +289,7 @@ QString AuthorizationManager::generateNewToken(bool isOp, QString user){ //unique token created - add it to the hash with the current time (+timeout) QString id = tok + "::::"+(isOp ? "operator" : "user")+"::::"+user; //append operator status to auth key HASH.insert(id, QDateTime::currentDateTime().addSecs(TIMEOUTSECS) ); - qDebug() << "Current HASH Contents:" << HASH.keys(); + //qDebug() << "Current HASH Contents:" << HASH.keys(); } return tok; } diff --git a/src/server/Dispatcher.cpp b/src/server/Dispatcher.cpp index 4cf02a3..750c4d8 100644 --- a/src/server/Dispatcher.cpp +++ b/src/server/Dispatcher.cpp @@ -41,7 +41,7 @@ void DProcess::startProc(){ connect(this, SIGNAL(error(QProcess::ProcessError)), this, SLOT(cmdError(QProcess::ProcessError)) ); } proclog.append("[Running Command: "+cmd+" ]"); - //qDebug() << "Proc Starting:" << ID << cmd; + qDebug() << "Proc Starting:" << ID << cmd; this->start(cmd); } @@ -138,18 +138,18 @@ DProcess* Dispatcher::queueProcess(Dispatcher::PROC_QUEUE queue, QString ID, QSt //Simplification routine for setting up a process DProcess* Dispatcher::createProcess(QString ID, QStringList cmds){ DProcess *P = new DProcess(); - //P->moveToThread(this->thread()); + P->moveToThread(this->thread()); P->cmds = cmds; P->ID = ID; - connect(P, SIGNAL(ProcFinished(QString)), this, SLOT(ProcFinished(QString)) ); return P; } // === PRIVATE SLOTS === void Dispatcher::mkProcs(Dispatcher::PROC_QUEUE queue, DProcess *P){ - //qDebug() << " - Create Process:" << queue << ID << cmds; + qDebug() << "mkProcs()"; //DProcess *P = createProcess(ID, cmds); - P->moveToThread(this->thread()); + //P->moveToThread(this->thread()); + connect(P, SIGNAL(ProcFinished(QString)), this, SLOT(ProcFinished(QString)) ); QList list; if(!HASH.contains(queue)){ HASH.insert(queue, list); } //insert an empty list HASH[queue] << P; //add this proc to the end of the list @@ -208,8 +208,10 @@ for(int i=0; iID; emit DispatchStarting(list[j]->ID); - QTimer::singleShot(0,list[j], SLOT(startProc()) ); + list[j]->startProc(); + //QTimer::singleShot(0,list[j], SLOT(startProc()) ); } } } //end loop over list