hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into release-1.1.1

Browse Source
This commit is contained in:
Markus Makela
2015-05-11 09:05:55 +03:00
parent abd83ffbfc 14b2c149f5
commit 56b2d073c3
20 changed files with 190 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
log_manager/CMakeLists.txt
View File

@ -2,8 +2,8 @@ if(LOG_DEBUG)
add_definitions(-DSS_LOG_DEBUG)
endif()
add_library(log_manager SHARED log_manager.cc)
target_link_libraries(log_manager pthread aio stdc++)
target_link_libraries(log_manager pthread aio stdc++ utils)
install(TARGETS log_manager DESTINATION lib)
if(BUILD_TESTS)
add_subdirectory(test)
endif()
endif()

9
log_manager/log_manager.cc
View File

@ -1705,7 +1705,8 @@ static bool fnames_conf_init(
"-j <log path> ............(\"/tmp\")\n"
"-l <syslog log file ids> .......(no default)\n"
"-m <syslog ident> ............(argv[0])\n"
"-s <shmem log file ids> .......(no default)\n";
"-s <shmem log file ids> .......(no default)\n"
"-o .......(write logs to stdout)\n";
/**
* When init_started is set, clean must be done for it.
@ -2599,14 +2600,14 @@ static bool logfile_init(
}
#if defined(SS_DEBUG)
if (store_shmem)
if (store_shmem && !use_stdout)
{
fprintf(stderr, "%s\t: %s->%s\n",
STRLOGNAME(logfile_id),
logfile->lf_full_link_name,
logfile->lf_full_file_name);
}
else
else if(!use_stdout)
{
fprintf(stderr, "%s\t: %s\n",
STRLOGNAME(logfile_id),
@ -3153,7 +3154,7 @@ void flushall_logfiles(bool flush)
*/
void skygw_log_sync_all(void)
{
skygw_log_write(LOGFILE_TRACE,"Starting log flushing to disk.");
if(!use_stdout)skygw_log_write(LOGFILE_TRACE,"Starting log flushing to disk.");
flushall_logfiles(true);
skygw_message_send(lm->lm_logmes);
skygw_message_wait(lm->lm_clientmes);