mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-11-26 07:10:11 +01:00
2021-05-28 Fred Gleason <fredg@paravelsystems.com>
* Added an '--force-system-maintenance' switch to rdservice(8). Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
@@ -61,6 +61,7 @@ MainObject::MainObject(QObject *parent)
|
||||
bool ok=false;
|
||||
|
||||
svc_startup_target=MainObject::TargetAll;
|
||||
svc_force_system_maintenance=false;
|
||||
|
||||
//
|
||||
// Check for prior instance
|
||||
@@ -91,6 +92,10 @@ MainObject::MainObject(QObject *parent)
|
||||
svc_startup_target=target;
|
||||
rda->cmdSwitch()->setProcessed(i,true);
|
||||
}
|
||||
if(rda->cmdSwitch()->key(i)=="--force-system-maintenance") {
|
||||
svc_force_system_maintenance=true;
|
||||
rda->cmdSwitch()->setProcessed(i,true);
|
||||
}
|
||||
if(rda->cmdSwitch()->key(i)=="--initial-maintenance-interval") {
|
||||
initial_maintenance_interval=rda->cmdSwitch()->value(i).toInt(&ok);
|
||||
if(!ok) {
|
||||
@@ -158,20 +163,17 @@ void MainObject::processFinishedData(int id)
|
||||
RDProcess *proc=svc_processes.value(id);
|
||||
if(proc->process()->exitStatus()!=QProcess::NormalExit) {
|
||||
rda->syslog(LOG_WARNING,"process \"%s\" crashed!",
|
||||
(proc->program()+" "+proc->arguments().join(" ").trimmed()).
|
||||
toUtf8().constData());
|
||||
proc->prettyCommandString().toUtf8().constData());
|
||||
}
|
||||
else {
|
||||
if(proc->process()->exitCode()!=0) {
|
||||
rda->syslog(LOG_WARNING,"process \"%s\" exited with exit code %d",
|
||||
(proc->program()+" "+proc->arguments().join(" ").trimmed()).
|
||||
toUtf8().constData(),
|
||||
proc->prettyCommandString().toUtf8().constData(),
|
||||
proc->process()->exitCode());
|
||||
}
|
||||
else {
|
||||
rda->syslog(LOG_DEBUG,"process \"%s\" exited normally",
|
||||
(proc->program()+" "+proc->arguments().join(" ").trimmed()).
|
||||
toUtf8().constData());
|
||||
proc->prettyCommandString().toUtf8().constData());
|
||||
}
|
||||
}
|
||||
proc->process()->deleteLater();
|
||||
|
||||
Reference in New Issue
Block a user