fix canifconfig error handling

HubertD · May 22, 2016 · 5bb293b · 5bb293b
1 parent 237252e
commit 5bb293b
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/driver/SocketCanDriver/SocketCanInterface.cpp b/src/driver/SocketCanDriver/SocketCanInterface.cpp
@@ -135,6 +135,9 @@ void SocketCanInterface::applyConfig(const MeasurementInterface &mi)
     }
 
     log_info(QString("calling canifconfig to reconfigure interface %1").arg(getName()));
+    QStringList sl = buildCanIfConfigArgs(mi);
+    sl.prepend("canifconfig");
+    log_info(sl.join(" "));
 
     QProcess canIfConfig;
     canIfConfig.start("canifconfig", buildCanIfConfigArgs(mi));
@@ -143,9 +146,13 @@ void SocketCanInterface::applyConfig(const MeasurementInterface &mi)
         return;
     }
 
-    if (canIfConfig.exitStatus() != 0) {
-        log_error(QString("canifconfig failed:"));
-        log_error(canIfConfig.readAllStandardError());
+    if (canIfConfig.exitStatus()!=QProcess::NormalExit) {
+        log_error(QString("canifconfig crashed"));
+        return;
+    }
+
+    if (canIfConfig.exitCode() != 0) {
+        log_error(QString("canifconfig failed: ") + QString(canIfConfig.readAllStandardError()).trimmed());
         return;
     }