mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-20 20:48:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix logging facility. Liblinphone outputs in the "liblinphone" log domain, mediastreamer and ortp have now their own log domains too.

Browse source
This commit is contained in:
Simon Morlat 2017-10-31 12:21:59 +01:00
parent 3a8fb2bb6d
commit 583002cfcd
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
coreapi/CMakeLists.txt
View file

@ -153,6 +153,7 @@ bc_git_version(liblinphone ${PROJECT_VERSION})
add_definitions(
-DUSE_BELLESIP
-DLIBLINPHONE_EXPORTS
-DBCTBX_LOG_DOMAIN="liblinphone"
)
set(LIBS

7
coreapi/linphonecore.c
View file

@ -481,14 +481,17 @@ void linphone_core_set_log_level(OrtpLogLevel loglevel) {
linphone_logging_service_set_log_level(log_service, _bctbx_log_level_to_linphone_log_level(loglevel));
}
void linphone_core_set_log_level_mask(unsigned int mask) {
LinphoneLoggingService *log_service = linphone_logging_service_get();
linphone_logging_service_set_log_level_mask(log_service, _bctbx_log_mask_to_linphone_log_mask(mask));
}
unsigned int linphone_core_get_log_level_mask(void) {
LinphoneLoggingService *log_service = linphone_logging_service_get();
return linphone_logging_service_get_log_level_mask(log_service);
}
static int _open_log_collection_file_with_idx(int idx) {
struct stat statbuf;
char *log_filename;
@ -591,8 +594,8 @@ static void linphone_core_log_collection_handler(const char *domain, OrtpLogLeve
}
if (liblinphone_log_collection_file) {
ortp_mutex_lock(&liblinphone_log_collection_mutex);
ret = fprintf(liblinphone_log_collection_file,"%i-%.2i-%.2i %.2i:%.2i:%.2i:%.3i %s %s\n",
1900 + lt->tm_year, lt->tm_mon + 1, lt->tm_mday, lt->tm_hour, lt->tm_min, lt->tm_sec, (int)(tp.tv_usec / 1000), lname, msg);
ret = fprintf(liblinphone_log_collection_file,"%i-%.2i-%.2i %.2i:%.2i:%.2i:%.3i [%s] %s %s\n",
1900 + lt->tm_year, lt->tm_mon + 1, lt->tm_mday, lt->tm_hour, lt->tm_min, lt->tm_sec, (int)(tp.tv_usec / 1000), domain, lname, msg);
fflush(liblinphone_log_collection_file);
if (ret > 0) {
liblinphone_log_collection_file_size += ret;

9
coreapi/logging.c
View file

@ -69,7 +69,7 @@ LinphoneLogLevel _bctbx_log_level_to_linphone_log_level(BctbxLogLevel level) {
if (response != tmap.cend()) {
return response->first;
} else {
ms_fatal("%s(): invalid argument [%d]", __FUNCTION__, level);
ms_fatal("%s(): invalid argument [%d]", __FUNCTION__, level);
return LinphoneLogLevelDebug;
}
}
@ -175,9 +175,12 @@ LinphoneLoggingServiceCbs *linphone_logging_service_get_callbacks(const Linphone
}
static const char *_linphone_logging_service_log_domains[] = {
ORTP_LOG_DOMAIN,
"bctbx",
"ortp",
"bzrtp",
"mediastreamer",
BELLE_SIP_LOG_DOMAIN,
BCTBX_LOG_DOMAIN,
NULL
};
@ -196,7 +199,7 @@ void linphone_logging_service_set_log_level_mask(LinphoneLoggingService *log_ser
}
unsigned int linphone_logging_service_get_log_level_mask(const LinphoneLoggingService *log_service) {
return _bctbx_log_mask_to_linphone_log_mask(bctbx_get_log_level_mask(ORTP_LOG_DOMAIN));
return _bctbx_log_mask_to_linphone_log_mask(bctbx_get_log_level_mask(BCTBX_LOG_DOMAIN));
}
void linphone_logging_service_set_log_file(const LinphoneLoggingService *service, const char *dir, const char *filename, size_t max_size) {

2
tester/liblinphone_tester.c
View file

@ -167,7 +167,7 @@ static void log_handler(int lev, const char *fmt, va_list args) {
#endif
va_end(cap);
#endif
bctbx_logv(ORTP_LOG_DOMAIN, lev, fmt, args);
bctbx_logv(BCTBX_LOG_DOMAIN, lev, fmt, args);
}
void liblinphone_tester_init(void(*ftester_printf)(int level, const char *fmt, va_list args)) {