diff options
author | Jukka Rissanen <jukka.rissanen@linux.intel.com> | 2012-11-12 14:07:20 +0200 |
---|---|---|
committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2012-11-23 12:58:50 +0200 |
commit | a426464354273a5586612b6577288e3662e3f8ac (patch) | |
tree | 20a308ed2a8807413acd9c6ddf70ffe2ef092894 | |
parent | 8c12ec683a443b72c600751e3496a790bade6981 (diff) | |
download | connman-a426464354273a5586612b6577288e3662e3f8ac.tar.gz connman-a426464354273a5586612b6577288e3662e3f8ac.tar.bz2 connman-a426464354273a5586612b6577288e3662e3f8ac.zip |
log: Give program name and version in log init
This allows the correct output when the log functions
are used from separate vpn daemon.
-rw-r--r-- | src/connman.h | 3 | ||||
-rw-r--r-- | src/log.c | 5 | ||||
-rw-r--r-- | src/main.c | 2 | ||||
-rw-r--r-- | unit/test-nat.c | 2 |
4 files changed, 7 insertions, 5 deletions
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 <connman/log.h> 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); @@ -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; } @@ -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); diff --git a/unit/test-nat.c b/unit/test-nat.c index 4a48461d..df8a2b59 100644 --- a/unit/test-nat.c +++ b/unit/test-nat.c @@ -147,7 +147,7 @@ int main(int argc, char *argv[]) g_test_init(&argc, &argv, NULL); - __connman_log_init(argv[0], "*", FALSE, TRUE); + __connman_log_init(argv[0], "*", FALSE, TRUE, "test-nat", VERSION); __connman_iptables_init(); __connman_nat_init(); |