diff --git a/SAS/CleanupTool/src/cepdeletedialog.cpp b/SAS/CleanupTool/src/cepdeletedialog.cpp index 36d6f1d7020ed129d4241b94151c0c5082b8bd15..ef8aec435e8a118aebf689378dda9af8a4d883a2 100644 --- a/SAS/CleanupTool/src/cepdeletedialog.cpp +++ b/SAS/CleanupTool/src/cepdeletedialog.cpp @@ -41,8 +41,10 @@ CEPdeleteDialog::CEPdeleteDialog(QWidget *parent) #if defined Q_OS_WIN itsConnectCmd = "C:\\progra~1\\putty\\plink -agent lofarsys@"; + itsCEP4ConnectCmd = "C:\\progra~1\\putty\\plink -agent lofarsys@head01.cep4.control.lofar "; #elif defined Q_OS_UNIX itsConnectCmd = "ssh lofarsys@lhn001.cep2.lofar ssh "; + itsCEP4ConnectCmd = "ssh lofarsys@head01.cep4.control.lofar "; #else std::cerr << "ERROR: Unknown operating system. Don't know how to connect with storage nodes" << std::endl; return; @@ -198,7 +200,11 @@ void CEPdeleteDialog::deleteConfirmed(void) { QProcess *fp = new QProcess(this); itsCleanProcesses[nodeIt->first] = std::pair<runState, QProcess *>(RUNNING, fp); connect(fp, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(nodeCleanFinished(int, QProcess::ExitStatus))); - cmd = itsConnectCmd + nodeIt->first + ".cep2.lofar " + nodeIt->second; + if (nodeIt->first == "CEP4") { + cmd = itsCEP4ConnectCmd + nodeIt->second; + } else { + cmd = itsConnectCmd + nodeIt->first + ".cep2.lofar " + nodeIt->second; + } itsParentCleanupDialog->writeLog("executing:" + cmd); fp->start(cmd); } @@ -228,7 +234,11 @@ void CEPdeleteDialog::retryDelete(void) { QProcess *fp = new QProcess(this); retryCleanProcesses[nodeIt->first] = std::pair<runState, QProcess *>(RUNNING, fp); connect(fp, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(nodeCleanFinished(int, QProcess::ExitStatus))); - cmd = itsConnectCmd + nodeIt->first + ".cep2.lofar " + nodeIt->second; + if (nodeIt->first == "CEP4") { + cmd = itsCEP4ConnectCmd + nodeIt->second; + } else { + cmd = itsConnectCmd + nodeIt->first + ".cep2.lofar " + nodeIt->second; + } itsParentCleanupDialog->writeLog("retrying :" + cmd); fp->start(cmd); } diff --git a/SAS/CleanupTool/src/cepdeletedialog.h b/SAS/CleanupTool/src/cepdeletedialog.h index 4c63b1f53aed0270a3fc57e7b14d4fa21ff3ebbc..00d5a7c6cbf93efd188e8b3e2eba9d73c1d6413a 100644 --- a/SAS/CleanupTool/src/cepdeletedialog.h +++ b/SAS/CleanupTool/src/cepdeletedialog.h @@ -66,6 +66,7 @@ private: int itsRow, itsExitCode, itsRetryCount; QProcess *fp; QString itsConnectCmd; + QString itsCEP4ConnectCmd; runState itsState; std::map<QString, QString> itsNodeCommands;