wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-19 11:09:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

services: do not start services before all stopped processes has been halted

Browse Source 
Signed-off-by: Jonas Johansson <jonas.johansson@westermo.se>
This commit is contained in:
Jonas Johansson committed 2016-05-19 14:46:59 +02:00
1 parent c1f725340d
commit c5fad8e659
3 files changed
+40 -75
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

service.c
+8 -55
View File
@@ -42,8 +42,6 @@
#define RESPAWN_MAX 10 /* Prevent endless respawn of faulty services. */
static int in_teardown = 0, in_dyn_teardown = 0;
#ifndef INETD_DISABLED
static svc_t *find_inetd_svc (char *path, char *service, char *proto);
#endif
@@ -332,19 +330,6 @@ static int service_restart(svc_t *svc)
return err;
}
/**
* service_reload_dynamic_finish - Finish dynamic service reload
*
* Second stage of dynamic reload. Called either directly from first
* stage if no services had to be stopped, or later from
* service_monitor once all stopped services have been collected.
*/
static void service_reload_dynamic_finish(void)
{
in_dyn_teardown = 0;
sm_step(&sm);
}
/**
* service_reload_dynamic - Called on SIGHUP, 'init q' or 'initctl reload'
*
@@ -354,24 +339,10 @@ static void service_reload_dynamic_finish(void)
*/
void service_reload_dynamic(void)
{
in_dyn_teardown = 1;
sm_set_reload(&sm);
sm_step(&sm);
}
/**
* service_runlevel_finish - Finish runlevel change
*
* Second stage of runlevel change. Called either directly from first
* stage if no services had to be stopped, or later from
* service_monitor once all stopped services have been collected.
*/
static void service_runlevel_finish(void)
{
in_teardown = 0;
sm_step(&sm);
}
/**
* service_runlevel - Change to a new runlevel
* @newlevel: New runlevel to activate
@@ -381,7 +352,6 @@ static void service_runlevel_finish(void)
*/
void service_runlevel(int newlevel)
{
in_teardown = 1;
sm_set_runlevel(&sm, newlevel);
sm_step(&sm);
}
@@ -627,29 +597,6 @@ void service_unregister(svc_t *svc)
svc_del(svc);
}
/**
* service_teardown_finish - Complete runlevel change or dynamic reload
*
* If any runlevel change or dynamic service reload is in progress and
* all services that had to be stopped have been collected, run the
* corresponding second stage.
*/
static void service_teardown_finish(void)
{
if (!(in_teardown || in_dyn_teardown))
return;
if (!service_stop_is_done())
return;
if (in_teardown)
service_runlevel_finish();
if (in_dyn_teardown)
service_reload_dynamic_finish();
}
void service_monitor(pid_t lost)
{
svc_t *svc;
@@ -676,8 +623,7 @@ void service_monitor(pid_t lost)
svc->pid = 0;
service_step(svc);
/* Check if we're still collecting stopped dynamic services */
service_teardown_finish();
sm_step(&sm);
}
static void svc_set_state(svc_t *svc, svc_state_t new)
@@ -757,6 +703,10 @@ restart:
break;
}
/* wait until all processes has been stopped before continuing... */
if (sm_is_in_teardown(&sm))
break;
err = service_start(svc);
if (err) {
(*restart_counter)++;
@@ -813,6 +763,9 @@ restart:
case COND_ON:
if (svc_is_changed(svc)) {
if (svc->sighup) {
/* wait until all processes has been stopped before continuing... */
if (sm_is_in_teardown(&sm))
break;
service_restart(svc);
} else {
service_stop(svc);