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

Fixed dbfwfilter rule parser build failure

Browse Source 
The rule parser used old log manager initialization calls
and looked for the source files in the wrong place.
This commit is contained in:
Markus Makela 2016-03-29 16:07:10 +03:00
parent b683a5dcf4
commit bda0c0b013
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/modules/filter/CMakeLists.txt
View File

@ -60,13 +60,6 @@ if(BUILD_SLAVELAG)
install(TARGETS slavelag DESTINATION ${MAXSCALE_LIBDIR})
endif()
if(BUILD_TOOLS)
add_executable(ruleparser dbfwfilter.c)
target_compile_definitions(ruleparser PUBLIC "BUILD_RULE_PARSER")
target_link_libraries(ruleparser maxscale-common)
install(TARGETS ruleparser DESTINATION ${MAXSCALE_BINDIR})
endif()
add_subdirectory(hint)
add_subdirectory(dbfwfilter)

7
server/modules/filter/dbfwfilter/CMakeLists.txt
View File

@ -10,6 +10,13 @@ if(BISON_FOUND AND FLEX_FOUND)
target_link_libraries(dbfwfilter maxscale-common)
set_target_properties(dbfwfilter PROPERTIES VERSION "1.0.0")
install(TARGETS dbfwfilter DESTINATION ${MAXSCALE_LIBDIR})
if(BUILD_TOOLS)
add_executable(dbfwruleparser dbfwfilter.c ${BISON_ruleparser_OUTPUTS} ${FLEX_token_OUTPUTS})
target_compile_definitions(dbfwruleparser PUBLIC "BUILD_RULE_PARSER")
target_link_libraries(dbfwruleparser maxscale-common)
install(TARGETS dbfwruleparser DESTINATION ${MAXSCALE_BINDIR})
endif()
else()
message(FATAL_ERROR "Could not find Bison or Flex: ${BISON_EXECUTABLE} ${FLEX_EXECUTABLE}")
endif()

2
server/modules/filter/dbfwfilter/dbfwfilter.c
View File

@ -2243,7 +2243,7 @@ int main(int argc, char** argv)
NULL
};
mxs_log_init(argc_, argv_);
mxs_log_init(NULL, NULL, MXS_LOG_TARGET_DEFAULT);
init_test_env(home);