diff --git a/port-files/files/sysadm-bridge.in b/port-files/files/sysadm-bridge.in index 35b3efb..bb607c1 100755 --- a/port-files/files/sysadm-bridge.in +++ b/port-files/files/sysadm-bridge.in @@ -12,7 +12,7 @@ depend() { start() { ebegin "Starting $name" - start-stop-daemon --start -m -b -p /var/run/sysadm-bridge.pid \ + supervise-daemon --start -p /var/run/sysadm-bridge.pid \ %%PREFIX%%/bin/sysadm-bridge eend $? } diff --git a/port-files/files/sysadm-rest.in b/port-files/files/sysadm-rest.in index 6208de3..d73f766 100755 --- a/port-files/files/sysadm-rest.in +++ b/port-files/files/sysadm-rest.in @@ -12,7 +12,7 @@ depend() { start() { ebegin "Starting $name" - start-stop-daemon --start -m -b -p /var/run/sysadm-rest.pid \ + supervise-daemon --start -p /var/run/sysadm-rest.pid \ %%PREFIX%%/bin/sysadm-binary -- -rest eend $? } diff --git a/port-files/files/sysadm.in b/port-files/files/sysadm.in index 2a5b99e..7546f65 100755 --- a/port-files/files/sysadm.in +++ b/port-files/files/sysadm.in @@ -12,7 +12,7 @@ depend() { start() { ebegin "Starting $name" - start-stop-daemon --start -m -b -p /var/run/sysadm.pid \ + supervise-daemon --start -p /var/run/sysadm.pid \ %%PREFIX%%/bin/sysadm-binary eend $? } diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp index 3a8fa5f..0b71c5e 100644 --- a/src/server/WebBackend.cpp +++ b/src/server/WebBackend.cpp @@ -603,6 +603,14 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmUpdateRequest(const QJsonVal }else if(act=="changesettings"){ ok = true; out->insert("changesettings", sysadm::Update::writeSettings(in_args.toObject()) ); + + }else if(act=="listlogs"){ + ok = true; + out->insert("listlogs", sysadm::Update::listLogs() ); + + }else if(act=="readlogs" && in_args.toObject().contains("logs") ){ + ok = true; + out->insert("readlogs", sysadm::Update::readLog(in_args.toObject()) ); } } //end of "action" key usage diff --git a/src/server/library/sysadm-update.cpp b/src/server/library/sysadm-update.cpp index 6de29ea..8235626 100644 --- a/src/server/library/sysadm-update.cpp +++ b/src/server/library/sysadm-update.cpp @@ -310,3 +310,38 @@ QJsonObject Update::writeSettings(QJsonObject obj){ return ret; } + +//List/Read update logs +QJsonObject Update::listLogs(){ + QJsonObject out; + QDir logdir("/var/log"); + QFileInfoList logs = logdir.entryInfoList(QStringList() << "pc-updatemanager*", QDir::Files, QDir::Time); + for(int i=0; i