wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-11-06 15:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor, only show process progress if -- Description is set

Browse Source 
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2018-01-16 14:15:10 +01:00
1 parent 36e001d636
commit e439b79e82
1 file changed
+21 -11
Download Patch File Download Diff File Expand all files Collapse all files
src/service.c
+21 -11
View File
@@ -137,7 +137,7 @@ static int is_norespawn(void)
*/ */
static int service_start(svc_t *svc) static int service_start(svc_t *svc)
{ {
int i, result = 0; int i, result = 0, do_progress = 1;
pid_t pid; pid_t pid;
sigset_t nmask, omask; sigset_t nmask, omask;
@@ -160,10 +160,15 @@ static int service_start(svc_t *svc)
return inetd_start(&svc->inetd); return inetd_start(&svc->inetd);
#endif #endif
if (svc_is_daemon(svc)) if (!svc->desc || !svc->desc[0])
print_desc("Starting ", svc->desc); do_progress = 0;
else
print_desc("", svc->desc); if (do_progress) {
if (svc_is_daemon(svc))
print_desc("Starting ", svc->desc);
else
print_desc("", svc->desc);
}
/* Declare we're waiting for svc to create its pidfile */ /* Declare we're waiting for svc to create its pidfile */
svc_starting(svc); svc_starting(svc);
@@ -357,7 +362,8 @@ static int service_start(svc_t *svc)
pid_file_create(svc); pid_file_create(svc);
sigprocmask(SIG_SETMASK, &omask, NULL); sigprocmask(SIG_SETMASK, &omask, NULL);
print_result(result); if (do_progress)
print_result(result);
/* /*
* Only run hook on successful start, and *after* having printed * Only run hook on successful start, and *after* having printed
@@ -413,14 +419,14 @@ static int service_stop(svc_t *svc)
#ifdef INETD_ENABLED #ifdef INETD_ENABLED
if (svc_is_inetd(svc)) { if (svc_is_inetd(svc)) {
int do_print = runlevel != 1 && !svc_is_busy(svc); int do_progress = runlevel != 1 && !svc_is_busy(svc);
if (do_print) if (do_progress)
print_desc("Stopping ", svc->desc); print_desc("Stopping ", svc->desc);
inetd_stop(&svc->inetd); inetd_stop(&svc->inetd);
if (do_print) if (do_progress)
print_result(0); print_result(0);
return 0; return 0;
} }
@@ -473,7 +479,8 @@ static int service_restart(svc_t *svc)
return 1; return 1;
} }
print_desc("Restarting ", svc->desc); if (svc->desc && svc->desc[0])
print_desc("Restarting ", svc->desc);
/* Declare we're waiting for svc to re-assert/touch its pidfile */ /* Declare we're waiting for svc to re-assert/touch its pidfile */
svc_starting(svc); svc_starting(svc);
@@ -487,7 +494,10 @@ static int service_restart(svc_t *svc)
touch(pid_file(svc)); touch(pid_file(svc));
} }
return print_result(rc); if (svc->desc && svc->desc[0])
print_result(rc);
return rc;
} }
/** /**