From a426464354273a5586612b6577288e3662e3f8ac Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Mon, 12 Nov 2012 14:07:20 +0200 Subject: log: Give program name and version in log init This allows the correct output when the log functions are used from separate vpn daemon. --- src/connman.h | 3 ++- src/log.c | 5 +++-- src/main.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/connman.h b/src/connman.h index 014552a4..08e03032 100644 --- a/src/connman.h +++ b/src/connman.h @@ -114,7 +114,8 @@ int __connman_agent_report_error(struct connman_service *service, #include int __connman_log_init(const char *program, const char *debug, - connman_bool_t detach, connman_bool_t backtrace); + connman_bool_t detach, connman_bool_t backtrace, + const char *program_name, const char *program_version); void __connman_log_cleanup(connman_bool_t backtrace); void __connman_log_enable(struct connman_debug_desc *start, struct connman_debug_desc *stop); diff --git a/src/log.c b/src/log.c index 9a68a4b9..4e305a98 100644 --- a/src/log.c +++ b/src/log.c @@ -292,7 +292,8 @@ void __connman_log_enable(struct connman_debug_desc *start, } int __connman_log_init(const char *program, const char *debug, - connman_bool_t detach, connman_bool_t backtrace) + connman_bool_t detach, connman_bool_t backtrace, + const char *program_name, const char *program_version) { static char path[PATH_MAX]; int option = LOG_NDELAY | LOG_PID; @@ -313,7 +314,7 @@ int __connman_log_init(const char *program, const char *debug, openlog(basename(program), option, LOG_DAEMON); - syslog(LOG_INFO, "Connection Manager version %s", VERSION); + syslog(LOG_INFO, "%s version %s", program_name, program_version); return 0; } diff --git a/src/main.c b/src/main.c index 187104b8..345791b6 100644 --- a/src/main.c +++ b/src/main.c @@ -547,7 +547,7 @@ int main(int argc, char *argv[]) g_dbus_set_disconnect_function(conn, disconnect_callback, NULL, NULL); __connman_log_init(argv[0], option_debug, option_detach, - option_backtrace); + option_backtrace, "Connection Manager", VERSION); __connman_dbus_init(conn); -- cgit v1.2.3