diff options
| -rw-r--r-- | initd/early.c | 1 | ||||
| -rw-r--r-- | initd/init.c | 2 | ||||
| -rw-r--r-- | initd/mkdev.c | 2 | ||||
| -rw-r--r-- | log.h | 16 | ||||
| -rw-r--r-- | procd.c | 2 | ||||
| -rw-r--r-- | state.c | 3 |
6 files changed, 11 insertions, 15 deletions
diff --git a/initd/early.c b/initd/early.c index beb7b69..5ee49ee 100644 --- a/initd/early.c +++ b/initd/early.c @@ -21,7 +21,6 @@ #include <unistd.h> #include <stdlib.h> -#include "../log.h" #include "init.h" static void diff --git a/initd/init.c b/initd/init.c index 0d201bc..9818c4f 100644 --- a/initd/init.c +++ b/initd/init.c @@ -72,6 +72,8 @@ main(int argc, char **argv) { pid_t pid; + ulog_open(ULOG_KMSG, LOG_DAEMON, "init"); + sigaction(SIGTERM, &sa_shutdown, NULL); sigaction(SIGUSR1, &sa_shutdown, NULL); sigaction(SIGUSR2, &sa_shutdown, NULL); diff --git a/initd/mkdev.c b/initd/mkdev.c index 3471461..a9a2320 100644 --- a/initd/mkdev.c +++ b/initd/mkdev.c @@ -28,8 +28,6 @@ #include "init.h" -#include "../log.h" - static char **patterns; static int n_patterns; static char buf[PATH_MAX]; @@ -15,23 +15,15 @@ #ifndef __LOG_H #define __LOG_H -#include <syslog.h> +#include <libubox/ulog.h> #define DEBUG(level, fmt, ...) do { \ if (debug >= level) { \ - syslog(0, fmt, ## __VA_ARGS__); \ - fprintf(stderr, "procd: %s(%d): " fmt, __func__, __LINE__, ## __VA_ARGS__); \ + ulog(LOG_DEBUG, fmt, ## __VA_ARGS__); \ } } while (0) -#define LOG(fmt, ...) do { \ - syslog(0, fmt, ## __VA_ARGS__); \ - fprintf(stderr, "procd: "fmt, ## __VA_ARGS__); \ - } while (0) - -#define ERROR(fmt, ...) do { \ - syslog(0, fmt, ## __VA_ARGS__); \ - fprintf(stderr, "procd: "fmt, ## __VA_ARGS__); \ - } while (0) +#define LOG ULOG_INFO +#define ERROR ULOG_ERR extern unsigned int debug; @@ -43,6 +43,8 @@ int main(int argc, char **argv) int ch; char *dbglvl = getenv("DBGLVL"); + ulog_open(ULOG_KMSG, LOG_DAEMON, "procd"); + if (dbglvl) { debug = atoi(dbglvl); unsetenv("DBGLVL"); @@ -116,6 +116,9 @@ static void state_enter(void) procd_inittab_run("askconsole"); procd_inittab_run("askfirst"); procd_inittab_run("sysinit"); + + // switch to syslog log channel + ulog_open(ULOG_SYSLOG, LOG_DAEMON, "procd"); break; case STATE_RUNNING: |