[Tarantool-patches] [PATCH 4/4] feedback: add cmake option to disable the daemon
Vladislav Shpilevoy
v.shpilevoy at tarantool.org
Wed Apr 15 23:04:51 MSK 2020
Hi! Thanks for the review!
>> diff --git a/src/box/lua/init.c b/src/box/lua/init.c
>> index 9db740de6..29217c21e 100644
>> --- a/src/box/lua/init.c
>> +++ b/src/box/lua/init.c
>> @@ -81,7 +83,14 @@ static const char *lua_sources[] = {
>> "box/session", session_lua,
>> "box/tuple", tuple_lua,
>> "box/schema", schema_lua,
>> +#if ENABLE_FEEDBACK_DAEMON
>> + /*
>> + * It is important to initialize the daemon before
>> + * load_cfg, because the latter peeks up some values
>
> Peeks -> Picks ?
Sure, that is a typo, thanks.
====================
diff --git a/src/box/lua/init.c b/src/box/lua/init.c
index 29217c21e..0a65c3b56 100644
--- a/src/box/lua/init.c
+++ b/src/box/lua/init.c
@@ -86,7 +86,7 @@ static const char *lua_sources[] = {
#if ENABLE_FEEDBACK_DAEMON
/*
* It is important to initialize the daemon before
- * load_cfg, because the latter peeks up some values
+ * load_cfg, because the latter picks up some values
* from the feedback daemon.
*/
"box/feedback_daemon", feedback_daemon_lua,
====================
Also I found that the ENABLE_FEEDBACK_DAEMON option description
contains multiple whitespaces in a row, because I misunderstood
how multiline strings in CMake work. Here is a fix:
====================
diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt
index 71ab636b3..309248ed7 100644
--- a/src/box/CMakeLists.txt
+++ b/src/box/CMakeLists.txt
@@ -3,8 +3,8 @@ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/src/box/lua)
# Sometimes 'spying' code is not acceptable even if it would be
# disabled by default. That option allows to remove the feedback
# daemon from the build completely.
-option(ENABLE_FEEDBACK_DAEMON "Feedback daemon which reports debug data to \
- the Tarantool team" ON)
+option(ENABLE_FEEDBACK_DAEMON "Feedback daemon which reports debug data to \
+the Tarantool team" ON)
add_subdirectory(sql)
====================
More information about the Tarantool-patches
mailing list