From 1b5b3b3f8d92c5a18f20dba512755acfc9bcc953 Mon Sep 17 00:00:00 2001 From: vdutta Date: Sat, 13 Nov 2021 15:57:55 +0530 Subject: [PATCH] cwmp: Updated syslogs --- cwmp.c | 4 ++++ log.c | 14 +------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/cwmp.c b/cwmp.c index 7f2bdaa..2e6217c 100644 --- a/cwmp.c +++ b/cwmp.c @@ -16,6 +16,7 @@ #include #include #include +#include #include "common.h" #include "session.h" @@ -701,6 +702,8 @@ int main(int argc, char **argv) sigset_t set; int error; + openlog("cwmp", LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1); + if ((error = cwmp_init(argc, argv, cwmp))) return error; @@ -794,5 +797,6 @@ int main(int argc, char **argv) cwmp_free(cwmp); CWMP_LOG(INFO, "EXIT ICWMP"); + closelog(); return CWMP_OK; } diff --git a/log.c b/log.c index 727ea6d..7bdcaa8 100644 --- a/log.c +++ b/log.c @@ -81,19 +81,10 @@ int log_set_on_file(char *value) return 1; } -extern char *__progname; - int log_set_on_syslog(char *value) { if ((strcasecmp(value, "TRUE") == 0) || (strcmp(value, "1") == 0) || (strcasecmp(value, "enable") == 0)) { - char ident[256]; - enable_log_syslog = true; - - setlogmask(LOG_UPTO(log_severity)); - snprintf(ident, sizeof(ident), "%s[%d]", __progname, getpid()); - ident[sizeof(ident) - 1] = '\0'; - openlog(ident, LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1); } else { enable_log_syslog = false; } @@ -155,11 +146,8 @@ void puts_log(int severity, const char *fmt, ...) if (enable_log_syslog) { va_start(args, fmt); - vsnprintf(buf, strlen(buf), fmt, args); - buf[sizeof(buf) - 1] = '\0'; + vsyslog(severity, fmt, args); va_end(args); - - syslog(severity, "%s", buf); } end: pthread_mutex_unlock(&mutex_log);