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

Fix #151: Install logit in libexec

Browse Source 
Signed-off-by: Magnus Malm <magnusmalm@gmail.com>
This commit is contained in:
Magnus Malm
2021-02-17 11:33:48 +01:00
parent 4ff6f6a1f1
commit 72a892ef55
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile.am
+3 -3
View File
@@ -15,9 +15,9 @@ pkglibexec_PROGRAMS = watchdogd
endif endif
if LOGIT if LOGIT
bin_PROGRAMS = logit pkglibexec_PROGRAMS = logit
logit_SOURCES = logit.c logit_SOURCES = logit.c
logit_CFLAGS = -W -Wall -Wextra -Wno-unused-parameter -std=gnu99 logit_CFLAGS = -W -Wall -Wextra -Wno-unused-parameter -std=gnu99
endif endif
finit_SOURCES = api.c cgroup.c cgroup.h \ finit_SOURCES = api.c cgroup.c cgroup.h \
src/service.c
+2 -2
View File
@@ -213,7 +213,7 @@ static int lredirect(svc_t *svc)
snprintf(sz, sizeof(sz), "%d", logfile_size_max); snprintf(sz, sizeof(sz), "%d", logfile_size_max);
snprintf(num, sizeof(num), "%d", logfile_count_max); snprintf(num, sizeof(num), "%d", logfile_count_max);
execlp("logit", "logit", "-f", svc->log.file, "-n", sz, "-r", num, NULL); execlp(FINIT_LIBPATH_ "/logit", "logit", "-f", svc->log.file, "-n", sz, "-r", num, NULL);
#else #else
logit(LOG_INFO, "logit disabled, logging %s to syslog instead", svc->name); logit(LOG_INFO, "logit disabled, logging %s to syslog instead", svc->name);
fallback_logger(tag, prio); fallback_logger(tag, prio);
@@ -227,7 +227,7 @@ static int lredirect(svc_t *svc)
prio = svc->log.prio; prio = svc->log.prio;
#ifdef LOGIT_ENABLED #ifdef LOGIT_ENABLED
execlp("logit", "logit", "-t", tag, "-p", prio, NULL); execlp("FINIT_LIBPATH_ logit", "logit", "-t", tag, "-p", prio, NULL);
#else #else
if (whichp("logger")) if (whichp("logger"))
execlp("logger", "logger", "-t", tag, "-p", prio, NULL); execlp("logger", "logger", "-t", tag, "-p", prio, NULL);