Skip to content

Commit

Permalink
Fix path to qt-openzwavedatabase.rcc (Issue #97) and make sure we qui…
Browse files Browse the repository at this point in the history
…t with a failure code (Issue #94)
  • Loading branch information
Fishwaldo committed Jun 9, 2020
1 parent 2447141 commit 337e488
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ COPY --from=builder /usr/lib/*/libqt-* /usr/local/lib/
COPY --from=builder /usr/local/lib*/libopenzwave* /usr/local/lib/
COPY --from=builder /usr/lib/*/libQt5Mqtt* /usr/local/lib/
COPY --from=builder /opt/qt-openzwave/tools/* /usr/local/bin/
COPY --from=builder /usr/share/qt5/qt-openzwavedatabase.rcc /usr/share/qt5/
COPY --from=builder /usr/share/qt5/qt-openzwavedatabase.rcc /usr/share/OpenZWave/
COPY Docker/startozwdaemon.sh /
RUN mkdir -p /opt/ozw/config/crashes/
ENV LD_LIBRARY_PATH="/usr/local/lib:/usr/local/lib64:$LD_LIBRARY_PATH"
Expand Down
6 changes: 3 additions & 3 deletions qt-ozwdaemon/mqttpublisher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ mqttpublisher::mqttpublisher(QSettings *settings, QObject *parent) :
}
if (mqttpass.isEmpty()) {
qWarning() << "Couldn't Find MQTT_PASSWORD enviroment variable or Docker Secret File";
QCoreApplication::quit();
QCoreApplication::exit(-1);
}
this->m_client->setUsername(settings->value("MQTTUsername", "").toString());
this->m_client->setPassword(mqttpass);
Expand Down Expand Up @@ -380,7 +380,7 @@ void mqttpublisher::updateLogStateChange()
this->setReady(false);
if (settings->value("StopOnFailure", false).toBool()) {
qCWarning(ozwmp) << "Exiting on Failure";
QCoreApplication::quit();
QCoreApplication::exit(-1);
}
return;
}
Expand Down Expand Up @@ -790,7 +790,7 @@ void mqttpublisher::driverFailed(quint32 homeID) {

if (settings->value("StopOnFailure", false).toBool()) {
qCWarning(ozwmp) << "Exiting on Failure";
QCoreApplication::quit();
QCoreApplication::exit(-1);
}
}
void mqttpublisher::driverReset(quint32 homeID) {
Expand Down

0 comments on commit 337e488

Please sign in to comment.