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

Added the missing skygw_log_sync_all function to the log_manager.h header and created a header for testing which contains the location of the testing directory.

Browse Source
This commit is contained in:
Markus Makela
2015-01-05 06:48:32 +02:00
parent 185e5b82d6
commit 3bf595673d
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -25,6 +25,7 @@ configure_file(${CMAKE_SOURCE_DIR}/server/include/version.h.in ${CMAKE_BINARY_DI
configure_file(${CMAKE_SOURCE_DIR}/maxscale.conf.in ${CMAKE_BINARY_DIR}/maxscale.conf.prep @ONLY) configure_file(${CMAKE_SOURCE_DIR}/maxscale.conf.in ${CMAKE_BINARY_DIR}/maxscale.conf.prep @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/etc/init.d/maxscale.in ${CMAKE_BINARY_DIR}/etc/init.d/maxscale.prep @ONLY) configure_file(${CMAKE_SOURCE_DIR}/etc/init.d/maxscale.in ${CMAKE_BINARY_DIR}/etc/init.d/maxscale.prep @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/etc/ubuntu/init.d/maxscale.in ${CMAKE_BINARY_DIR}/etc/ubuntu/init.d/maxscale.prep @ONLY) configure_file(${CMAKE_SOURCE_DIR}/etc/ubuntu/init.d/maxscale.in ${CMAKE_BINARY_DIR}/etc/ubuntu/init.d/maxscale.prep @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/server/test/maxscale_test.h.in ${CMAKE_BINARY_DIR}/server/include/maxscale_test.h)
set(CMAKE_C_FLAGS "-Wall -fPIC") set(CMAKE_C_FLAGS "-Wall -fPIC")

2
log_manager/log_manager.h
View File

@ -117,7 +117,7 @@ int skygw_log_rotate(logfile_id_t id);
int skygw_log_write_flush(logfile_id_t id, const char* format, ...); int skygw_log_write_flush(logfile_id_t id, const char* format, ...);
int skygw_log_enable(logfile_id_t id); int skygw_log_enable(logfile_id_t id);
int skygw_log_disable(logfile_id_t id); int skygw_log_disable(logfile_id_t id);
void skygw_log_sync_all(void);
EXTERN_C_BLOCK_END EXTERN_C_BLOCK_END

2
server/core/test/testpoll.c
View File

@ -51,7 +51,7 @@ int result;
"testpoll : Initialise the polling system."); "testpoll : Initialise the polling system.");
poll_init(); poll_init();
ss_dfprintf(stderr, "\t..done\nAdd a DCB"); ss_dfprintf(stderr, "\t..done\nAdd a DCB");
dcb = dcb_alloc(DCB_ROLE_SERVICE_LISTENER); dcb = dcb_alloc(DCB_ROLE_REQUEST_HANDLER);
if(dcb == NULL){ if(dcb == NULL){
ss_dfprintf(stderr, "\nError on function call: dcb_alloc() returned NULL.\n"); ss_dfprintf(stderr, "\nError on function call: dcb_alloc() returned NULL.\n");

9
server/test/maxscale_test.h.in Normal file
View File

@ -0,0 +1,9 @@
#ifndef MAXSCALE_TEST_H
#define MAXSCALE_TEST_H
#define TEST_DIR ${CMAKE_BINARY_DIR}
#define TEST_LOG_DIR ${CMAKE_BINARY_DIR}/log
#define TEST_BIN_DIR ${CMAKE_BINARY_DIR}/bin
#define TEST_MOD_DIR ${CMAKE_BINARY_DIR}/modules
#define TEST_LIB_DIR ${CMAKE_BINARY_DIR}/lib
#define TEST_ETC_DIR ${CMAKE_BINARY_DIR}/etc
#endif