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

Improve debug of initctl api

Browse Source 
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2017-11-19 16:45:07 +01:00
1 parent 0ee4657f1c
commit e0fb2b036d
1 file changed
+12 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/api.c
+12 -2
View File
@@ -169,7 +169,7 @@ static int do_handle_emit(char *buf, size_t len)
* `initctl runlevel 0` is issued we default to POWERDOWN the system * `initctl runlevel 0` is issued we default to POWERDOWN the system
* instead of just halting. * instead of just halting.
*/ */
static void cb(uev_t *w, void *arg, int events) static void api_cb(uev_t *w, void *arg, int events)
{ {
int sd, lvl; int sd, lvl;
struct init_request rq; struct init_request rq;
@@ -229,36 +229,44 @@ static void cb(uev_t *w, void *arg, int events)
break; break;
case INIT_CMD_DEBUG: case INIT_CMD_DEBUG:
_d("debug");
log_debug(); log_debug();
break; break;
case INIT_CMD_RELOAD: /* 'init q' and 'initctl reload' */ case INIT_CMD_RELOAD: /* 'init q' and 'initctl reload' */
_d("reload");
service_reload_dynamic(); service_reload_dynamic();
break; break;
case INIT_CMD_START_SVC: case INIT_CMD_START_SVC:
_d("start %s", rq.data);
result = do_start(rq.data, sizeof(rq.data)); result = do_start(rq.data, sizeof(rq.data));
break; break;
case INIT_CMD_STOP_SVC: case INIT_CMD_STOP_SVC:
_d("stop %s", rq.data);
result = do_stop(rq.data, sizeof(rq.data)); result = do_stop(rq.data, sizeof(rq.data));
break; break;
case INIT_CMD_RESTART_SVC: case INIT_CMD_RESTART_SVC:
_d("restart %s", rq.data);
result = do_restart(rq.data, sizeof(rq.data)); result = do_restart(rq.data, sizeof(rq.data));
break; break;
#ifdef INETD_ENABLED #ifdef INETD_ENABLED
case INIT_CMD_QUERY_INETD: case INIT_CMD_QUERY_INETD:
_d("query inetd");
result = do_query_inetd(rq.data, sizeof(rq.data)); result = do_query_inetd(rq.data, sizeof(rq.data));
break; break;
#endif #endif
case INIT_CMD_EMIT: case INIT_CMD_EMIT:
_d("emit %s", rq.data);
result = do_handle_emit(rq.data, sizeof(rq.data)); result = do_handle_emit(rq.data, sizeof(rq.data));
break; break;
case INIT_CMD_GET_RUNLEVEL: case INIT_CMD_GET_RUNLEVEL:
_d("get runlevel");
rq.runlevel = runlevel; rq.runlevel = runlevel;
break; break;
@@ -267,12 +275,14 @@ static void cb(uev_t *w, void *arg, int events)
goto leave; goto leave;
case INIT_CMD_WDOG_HELLO: case INIT_CMD_WDOG_HELLO:
_d("wdog hello");
if (rq.runlevel <= 0) { if (rq.runlevel <= 0) {
result = 1; result = 1;
break; break;
} }
if (wdogpid > 0 && wdogpid != rq.runlevel) { if (wdogpid > 0 && wdogpid != rq.runlevel) {
_d("Sending SIGTERM to %d", wdogpid);
kill(wdogpid, SIGTERM); kill(wdogpid, SIGTERM);
do_sleep(1); do_sleep(1);
} }
@@ -330,7 +340,7 @@ int api_init(uev_ctx_t *ctx)
goto error; goto error;
umask(oldmask); umask(oldmask);
if (!uev_io_init(ctx, &api_watcher, cb, NULL, sd, UEV_READ)) if (!uev_io_init(ctx, &api_watcher, api_cb, NULL, sd, UEV_READ))
return 0; return 0;
error: error: