Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-11 23:25:57 +01:00
Code Issues Projects Releases Wiki Activity

2020-10-09 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Updated rdservice(8) to use standard exit code defines.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2020-10-09 13:52:53 -04:00
parent 998e0124f6
commit 910be74180
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -20440,3 +20440,5 @@
command line mode. command line mode.
* Fixed a bug in rdlogmanager(1) that could leave a log lock * Fixed a bug in rdlogmanager(1) that could leave a log lock
asserted after exiting when handling schedule import errors. asserted after exiting when handling schedule import errors.
2020-10-09 Fred Gleason <fredg@paravelsystems.com>
* Updated rdservice(8) to use standard exit code defines.

10
rdservice/rdservice.cpp
View File

@@ -65,7 +65,7 @@ MainObject::MainObject(QObject *parent)
// //
if(RDGetPids("rdservice").size()>1) { if(RDGetPids("rdservice").size()>1) {
rda->syslog(LOG_ERR,"prior instance found"); rda->syslog(LOG_ERR,"prior instance found");
exit(1); exit(RD_EXIT_PRIOR_INSTANCE);
} }
// //
@@ -75,7 +75,7 @@ MainObject::MainObject(QObject *parent)
if(!rda->open(&err_msg,&err_type,false)) { if(!rda->open(&err_msg,&err_type,false)) {
rda->syslog(LOG_ERR,"unable to open database [%s]", rda->syslog(LOG_ERR,"unable to open database [%s]",
(const char *)err_msg.utf8()); (const char *)err_msg.utf8());
exit(2); exit(RD_EXIT_NO_DB);
} }
// //
@@ -91,7 +91,7 @@ MainObject::MainObject(QObject *parent)
} }
if(!rda->cmdSwitch()->processed(i)) { if(!rda->cmdSwitch()->processed(i)) {
fprintf(stderr,"rdservice: unknown command-line option\n"); fprintf(stderr,"rdservice: unknown command-line option\n");
exit(4); exit(RD_EXIT_UNKNOWN_OPTION);
} }
} }
@@ -109,7 +109,7 @@ MainObject::MainObject(QObject *parent)
Shutdown(); Shutdown();
rda->syslog(LOG_ERR,"unable to start service component [%s]", rda->syslog(LOG_ERR,"unable to start service component [%s]",
(const char *)err_msg.toUtf8()); (const char *)err_msg.toUtf8());
exit(3); exit(RD_EXIT_SVC_FAILED);
} }
// //
@@ -149,7 +149,7 @@ void MainObject::exitData()
Shutdown(); Shutdown();
RDDeletePid(RD_PID_DIR,"rdservice.pid"); RDDeletePid(RD_PID_DIR,"rdservice.pid");
rda->syslog(LOG_DEBUG,"shutting down normally"); rda->syslog(LOG_DEBUG,"shutting down normally");
exit(0); exit(RD_EXIT_OK);
} }
if(global_reload_dropboxes) { if(global_reload_dropboxes) {