Skip to content

Commit bf7ba5b

Browse files
committed
Added missing time stamp info to ClusterWidget
1 parent a2e8c50 commit bf7ba5b

File tree

2 files changed

+37
-7
lines changed

2 files changed

+37
-7
lines changed

src/guis/yarpmanager/src-manager/clusterWidget.cpp

+36-7
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ void ClusterWidget::onRunServer()
157157
{
158158
updateServerEntries();
159159

160+
yarp::manager::ErrorLogger* logger = yarp::manager::ErrorLogger::Instance();
160161
std::string cmdRunServer = getSSHCmd(cluster.user, cluster.nsNode, cluster.ssh_options);
161162
if (ui->checkRos->isChecked())
162163
{
@@ -169,7 +170,8 @@ void ClusterWidget::onRunServer()
169170
if (system(cmdRunServer.c_str()) != 0)
170171
{
171172
std::string err = "ClusterWidget: failed to run the server on " + cluster.nsNode;
172-
logError(QString(err.c_str()));
173+
logger->addError(err);
174+
reportErrors();
173175
}
174176
else
175177
{
@@ -201,10 +203,13 @@ void ClusterWidget::onStopServer()
201203

202204
cmdStopServer = cmdStopServer + " killall yarpserver &";
203205

206+
yarp::manager::ErrorLogger* logger = yarp::manager::ErrorLogger::Instance();
207+
204208
if (system(cmdStopServer.c_str()) != 0)
205209
{
206210
std::string err = "ClusterWidget: failed to stop the server on " + cluster.nsNode;
207-
logError(QString(err.c_str()));
211+
logger->addError(err);
212+
reportErrors();
208213
}
209214
else
210215
{
@@ -232,10 +237,12 @@ void ClusterWidget::onKillServer()
232237

233238
cmdKillServer = cmdKillServer + " killall -9 yarpserver &";
234239

240+
yarp::manager::ErrorLogger* logger = yarp::manager::ErrorLogger::Instance();
235241
if (system(cmdKillServer.c_str()) != 0)
236242
{
237243
std::string err = "ClusterWidget: failed to kill the server on " + cluster.nsNode;
238-
logError(QString(err.c_str()));
244+
logger->addError(err);
245+
reportErrors();
239246
}
240247
else
241248
{
@@ -284,10 +291,12 @@ void ClusterWidget::onRunSelected()
284291
{
285292
cmdRunYarprun.append("'");
286293
}
294+
yarp::manager::ErrorLogger* logger = yarp::manager::ErrorLogger::Instance();
287295
if (system(cmdRunYarprun.c_str()) != 0)
288296
{
289297
std::string err = "ClusterWidget: failed to run yarprun on " + node.name;
290-
logError(QString(err.c_str()));
298+
logger->addError(err);
299+
reportErrors();
291300
}
292301
else
293302
{
@@ -322,10 +331,12 @@ void ClusterWidget::onStopSelected()
322331

323332
cmdStopYarprun.append(" yarprun --exit --on ").append(portName).append(" &");
324333

334+
yarp::manager::ErrorLogger* logger = yarp::manager::ErrorLogger::Instance();
325335
if (system(cmdStopYarprun.c_str()) != 0)
326336
{
327337
std::string err = "ClusterWidget: failed to stop yarprun on " + node.name;
328-
logError(QString(err.c_str()));
338+
logger->addError(err);
339+
reportErrors();
329340
}
330341
else
331342
{
@@ -354,10 +365,12 @@ void ClusterWidget::onKillSelected()
354365

355366
cmdKillYarprun.append(" killall -9 yarprun &");
356367

368+
yarp::manager::ErrorLogger* logger = yarp::manager::ErrorLogger::Instance();
357369
if (system(cmdKillYarprun.c_str()) != 0)
358370
{
359371
std::string err = "ClusterWidget: failed to kill yarprun on " + node.name;
360-
logError(QString(err.c_str()));
372+
logger->addError(err);
373+
reportErrors();
361374
}
362375
else
363376
{
@@ -399,10 +412,12 @@ void ClusterWidget::onExecute()
399412

400413
cmdExecute.append(" ").append(command);
401414

415+
yarp::manager::ErrorLogger* logger = yarp::manager::ErrorLogger::Instance();
402416
if (system(cmdExecute.c_str()) != 0)
403417
{
404418
std::string err = "ClusterWidget: failed to run "+ command + " on " + node.name;
405-
logError(QString(err.c_str()));
419+
logger->addError(err);
420+
reportErrors();
406421
}
407422
else
408423
{
@@ -594,6 +609,20 @@ void ClusterWidget::updateServerEntries()
594609
cluster.nsNode = ui->nsNodeComboBox->currentText().simplified().trimmed().toStdString();
595610
}
596611

612+
void ClusterWidget::reportErrors()
613+
{
614+
yarp::manager::ErrorLogger* logger = yarp::manager::ErrorLogger::Instance();
615+
if (logger->errorCount() || logger->warningCount())
616+
{
617+
const char* err;
618+
while((err=logger->getLastError()))
619+
{
620+
QString msg = QString("ClusterWidget: %1").arg(err);
621+
emit logError(msg);
622+
}
623+
}
624+
}
625+
597626
ClusterWidget::~ClusterWidget()
598627
{
599628
if (clusLoader)

src/guis/yarpmanager/src-manager/clusterWidget.h

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ private slots:
4747
bool checkNameserver();
4848
bool checkNode(const std::string& name);
4949
void updateServerEntries();
50+
void reportErrors();
5051

5152

5253
Ui::ClusterWidget *ui;

0 commit comments

Comments
 (0)