diff options
| author | Regis Merlino <regis.merlino@intel.com> | 2013-08-23 11:46:06 +0200 |
|---|---|---|
| committer | Ludovic Ferrandis <ludovic.ferrandis@intel.com> | 2013-08-23 14:26:26 +0200 |
| commit | 13e6fae25f310994a6ca98b5e96254e44d530a16 (patch) | |
| tree | fd88b6de5a4ee5645c4bd20f8f18dad47468d05f | |
| parent | afda02fb4657ffc19eb71bd4621b347dc654ea46 (diff) | |
| download | dleyna-core-13e6fae25f310994a6ca98b5e96254e44d530a16.tar.gz | |
[Logs] Print correct service name & version
Signed-off-by: Regis Merlino <regis.merlino@intel.com>
| -rw-r--r-- | libdleyna/core/log.c | 11 | ||||
| -rw-r--r-- | libdleyna/core/log.h | 2 | ||||
| -rw-r--r-- | libdleyna/core/main-loop.c | 5 | ||||
| -rw-r--r-- | libdleyna/core/main-loop.h | 3 |
4 files changed, 13 insertions, 8 deletions
diff --git a/libdleyna/core/log.c b/libdleyna/core/log.c index 95e411f..2df721a 100644 --- a/libdleyna/core/log.c +++ b/libdleyna/core/log.c @@ -132,7 +132,7 @@ void dleyna_log_update_type_level(dleyna_log_type_t log_type, int log_level) (void) setlogmask(mask); } -void dleyna_log_init(const char *program) +void dleyna_log_init(const char *program, const char* version) { int option = LOG_NDELAY | LOG_PID; int old; @@ -148,7 +148,8 @@ void dleyna_log_init(const char *program) openlog(basename(program), option, LOG_DAEMON); old = setlogmask(LOG_MASK(LOG_INFO)); - syslog(LOG_INFO, "dLeyna version %s", VERSION); + syslog(LOG_INFO, "dLeyna core version %s", VERSION); + syslog(LOG_INFO, "%s version %s", program, version); (void) setlogmask(s_log_context.mask); s_log_context.old_mask = old; @@ -157,8 +158,10 @@ void dleyna_log_init(const char *program) &s_log_context); #if DLEYNA_LOG_LEVEL & DLEYNA_LOG_LEVEL_INFO - if (s_log_context.log_type != DLEYNA_LOG_TYPE_SYSLOG) - DLEYNA_LOG_INFO("dLeyna version %s", VERSION); + if (s_log_context.log_type != DLEYNA_LOG_TYPE_SYSLOG) { + DLEYNA_LOG_INFO("dLeyna core version %s", VERSION); + DLEYNA_LOG_INFO("%s version %s", program, version); + } #endif } diff --git a/libdleyna/core/log.h b/libdleyna/core/log.h index 50eefc0..6a0d28d 100644 --- a/libdleyna/core/log.h +++ b/libdleyna/core/log.h @@ -33,7 +33,7 @@ enum dleyna_log_type_t_ { }; typedef enum dleyna_log_type_t_ dleyna_log_type_t; -void dleyna_log_init(const char *program); +void dleyna_log_init(const char *program, const char *version); void dleyna_log_finalize(void); diff --git a/libdleyna/core/main-loop.c b/libdleyna/core/main-loop.c index 2b05bd8..9a78666 100644 --- a/libdleyna/core/main-loop.c +++ b/libdleyna/core/main-loop.c @@ -119,7 +119,8 @@ static void prv_context_free(void) dleyna_settings_delete(g_context.settings); } -int dleyna_main_loop_start(char *server, +int dleyna_main_loop_start(const char *server, + const char *version, const dleyna_control_point_t *control_point, gpointer user_data) { @@ -129,7 +130,7 @@ int dleyna_main_loop_start(char *server, g_type_init(); #endif - dleyna_log_init(server); + dleyna_log_init(server, version); if (!prv_context_init(server, control_point)) goto out; diff --git a/libdleyna/core/main-loop.h b/libdleyna/core/main-loop.h index 397e8e8..71d49be 100644 --- a/libdleyna/core/main-loop.h +++ b/libdleyna/core/main-loop.h @@ -26,7 +26,8 @@ #include "connector.h" #include "control-point.h" -int dleyna_main_loop_start(char *server, +int dleyna_main_loop_start(const char *server, + const char *version, const dleyna_control_point_t *control_point, gpointer user_data); void dleyna_main_loop_quit(void); |