mirror of
https://github.com/troglobit/finit.git
synced 2026-11-01 13:10:32 +00:00
sm_step(): Log pending stopped svc if we exit state machine
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
1 parent
8a1015cf3e
commit
70afaa16f5
1 file changed
+9
-2
@@ -89,6 +89,7 @@ int sm_is_in_teardown(sm_t *sm)
|
|||||||
|
|
||||||
void sm_step(sm_t *sm)
|
void sm_step(sm_t *sm)
|
||||||
{
|
{
|
||||||
|
svc_t *svc;
|
||||||
sm_state_t old_state;
|
sm_state_t old_state;
|
||||||
|
|
||||||
restart:
|
restart:
|
||||||
@@ -155,8 +156,11 @@ restart:
|
|||||||
* Need to wait for any services to stop? If so, exit early
|
* Need to wait for any services to stop? If so, exit early
|
||||||
* and perform second stage from service_monitor later.
|
* and perform second stage from service_monitor later.
|
||||||
*/
|
*/
|
||||||
if (!svc_stop_completed())
|
svc = svc_stop_completed();
|
||||||
|
if (svc) {
|
||||||
|
_e("Waiting to collect %s(%d) ...", svc->cmd, svc->pid);
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
/* Prev runlevel services stopped, call hooks before starting new runlevel ... */
|
/* Prev runlevel services stopped, call hooks before starting new runlevel ... */
|
||||||
_d("All services have been stoppped, calling runlevel change hooks ...");
|
_d("All services have been stoppped, calling runlevel change hooks ...");
|
||||||
@@ -208,8 +212,11 @@ restart:
|
|||||||
* Need to wait for any services to stop? If so, exit early
|
* Need to wait for any services to stop? If so, exit early
|
||||||
* and perform second stage from service_monitor later.
|
* and perform second stage from service_monitor later.
|
||||||
*/
|
*/
|
||||||
if (!svc_stop_completed())
|
svc = svc_stop_completed();
|
||||||
|
if (svc) {
|
||||||
|
_e("Waiting to collect %s(%d) ...", svc->cmd, svc->pid);
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
sm->in_teardown = 0;
|
sm->in_teardown = 0;
|
||||||
/* Cleanup stale services */
|
/* Cleanup stale services */
|
||||||
|
|||||||
Reference in new issue
Block a user