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

2018-08-10 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Changed installation location of caed(8), ripcd(8), rdcatchd(8)
	and rdrepld(8) from '@prefix@/bin' to '@prefix@/sbin'.
	* Removed code to detach from controlling terminal after startup
	from caed(8), ripcd(8), rdcatchd(8)
	and rdrepld(8).
	* Removed code to manage dropbox instances from rdcatchd(8).
	* Removed code to start service daemons automatically from
	user modules.
	* Added rdservice(8).
This commit is contained in:
Fred Gleason
2018-08-10 06:09:16 -04:00
parent 523c93c461
commit 223bdc2f84
53 changed files with 986 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
rdcatchd/rdcatchd.cpp
View File

@@ -42,7 +42,6 @@
#include <qsessionmanager.h>
#include <rdapplication.h>
#include <rdcheck_daemons.h>
#include <rdconf.h>
#include <rdcut.h>
#include <rddatedecode.h>
@@ -99,7 +98,6 @@ void SigHandler(int signum)
switch(signum) {
case SIGINT:
case SIGTERM:
RDDeletePid(RD_PID_DIR,"rdcatchd.pid");
LogLine(RDConfig::LogNotice,"rdcatchd exiting");
exit(0);
break;
@@ -218,14 +216,6 @@ MainObject::MainObject(QObject *parent)
}
}
//
// Make sure we're the only instance running
//
if(RDCheckDaemon(RD_RDCATCHD_PID)) {
printf("rdcatchd: aborting - multiple instances not allowed");
exit(1);
}
//
// Initialize Data Structures
//
@@ -379,17 +369,6 @@ MainObject::MainObject(QObject *parent)
}
delete q;
//
// Start Subprocesses
//
if(fork()==0) {
execl(QString(RD_PREFIX)+"/sbin/rdvairplayd","rdvairplayd",(char *)NULL);
rda->log(RDConfig::LogWarning,QString("failed to start rdvairplayd(1) [")+
QString(strerror(errno))+"]");
exit(1);
}
StartDropboxes();
//
// Playout Event Players
//
@@ -407,20 +386,13 @@ MainObject::MainObject(QObject *parent)
connect(catch_engine,SIGNAL(timeout(int)),this,SLOT(engineData(int)));
LoadEngine();
if(qApp->argc()==1) {
RDDetach(rda->config()->logCoreDumpDirectory());
}
else {
if(qApp->argc()!=1) {
debug=true;
}
::signal(SIGINT,SigHandler);
::signal(SIGTERM,SigHandler);
::signal(SIGCHLD,SigHandler);
if(!RDWritePid(RD_PID_DIR,"rdcatchd.pid")) {
printf("rdcatchd: aborting - can't write pid file\n");
exit(1);
}
//
// Start Heartbeat Timer
@@ -1846,8 +1818,11 @@ void MainObject::DispatchCommand(ServerConnection *conn)
LoadHeartbeat();
}
if(cmds.at(0)=="RX") { // Restart Dropbox Instances
StartDropboxes();
if(cmds.at(0)=="RX") { // Signal rdservice(8) to Restart Dropbox Instances
pid_t pid=RDGetPid(QString(RD_PID_DIR)+"/rdservice.pid");
if(pid>0) {
kill(pid,SIGUSR1);
}
}
if((cmds.at(0)=="MN")&&(cmds.size()==3)) { // Monitor State