mirror of
https://github.com/troglobit/finit.git
synced 2026-11-10 16:31:21 +00:00
Only mark rdeps dirty if main service is nohup
This patch changes a behavior that's been default since Finit 4.0,
introduced in 4d05bf9 with 4.0-rc2.
If service B depends on A and A needs to be reloaded, then B may be
affected. If A is declared as NOHUP <!>, then A will be stopped and
restarted, during which time the condition it provides is removed,
and B will also be stopped.
However, and as of this patch, if A is declared supporting HUP, then the
condition A provides will only go into flux, during which time B will be
SIGSTOPed instead of needing to be reloaded.
Fix #415
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
1 parent
54701422a5
commit
46ffa81f5c
2 files changed
+9
No files matched your search
@@ -2001,6 +2001,10 @@ static void svc_mark_affected(char *cond)
|
|||||||
* Called on conf_reload() to update service reverse dependencies.
|
* Called on conf_reload() to update service reverse dependencies.
|
||||||
* E.g., if ospfd depends on zebra and the zebra Finit conf has
|
* E.g., if ospfd depends on zebra and the zebra Finit conf has
|
||||||
* changed, we need to mark the ospfd Finit conf as changed too.
|
* changed, we need to mark the ospfd Finit conf as changed too.
|
||||||
|
*
|
||||||
|
* However, a daemon that depends on syslogd (sysklogd project), need
|
||||||
|
* not be reloeaded (SIGHUP'ed or stop/started) because syslogd support
|
||||||
|
* reloading its configuration file on SIGHUP.
|
||||||
*/
|
*/
|
||||||
void service_update_rdeps(void)
|
void service_update_rdeps(void)
|
||||||
{
|
{
|
||||||
@@ -2012,6 +2016,10 @@ void service_update_rdeps(void)
|
|||||||
if (!svc_is_changed(svc))
|
if (!svc_is_changed(svc))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
/* Service supports reloading conf without stop/start */
|
||||||
|
if (!svc_is_nohup(svc))
|
||||||
|
continue; /* Yup, no need to stop start rdeps */
|
||||||
|
|
||||||
svc_mark_affected(mkcond(svc, cond, sizeof(cond)));
|
svc_mark_affected(mkcond(svc, cond, sizeof(cond)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -259,6 +259,7 @@ static inline int svc_is_tty (svc_t *svc) { return svc && SVC_TYPE_TTY
|
|||||||
static inline int svc_is_runtask (svc_t *svc) { return svc && (SVC_TYPE_RUNTASK & svc->type);}
|
static inline int svc_is_runtask (svc_t *svc) { return svc && (SVC_TYPE_RUNTASK & svc->type);}
|
||||||
static inline int svc_is_forking (svc_t *svc) { return svc && svc->forking; }
|
static inline int svc_is_forking (svc_t *svc) { return svc && svc->forking; }
|
||||||
static inline int svc_is_manual (svc_t *svc) { return svc && svc->manual; }
|
static inline int svc_is_manual (svc_t *svc) { return svc && svc->manual; }
|
||||||
|
static inline int svc_is_nohup (svc_t *svc) { return svc && (0 == svc->sighup); }
|
||||||
|
|
||||||
static inline int svc_in_runlevel (svc_t *svc, int runlevel) { return svc && ISSET(svc->runlevels, runlevel); }
|
static inline int svc_in_runlevel (svc_t *svc, int runlevel) { return svc && ISSET(svc->runlevels, runlevel); }
|
||||||
static inline int svc_nohup (svc_t *svc) { return svc && (0 == svc->sighup || 0 != svc->args_dirty); }
|
static inline int svc_nohup (svc_t *svc) { return svc && (0 == svc->sighup || 0 != svc->args_dirty); }
|
||||||
|
|||||||
Reference in new issue
Block a user