From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: Serge Petrenko <sergepetrenko@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH 4/4] feedback: add cmake option to disable the daemon Date: Wed, 15 Apr 2020 22:04:51 +0200 [thread overview] Message-ID: <b2114425-c97a-badf-498f-ccec73ea61e1@tarantool.org> (raw) In-Reply-To: <8DB58B24-A230-4CFA-8FEB-10073767D364@tarantool.org> 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) ====================
next prev parent reply other threads:[~2020-04-15 20:04 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-12 20:13 [Tarantool-patches] [PATCH 0/4] CMake option to remove feedback daemon Vladislav Shpilevoy 2020-04-12 20:13 ` [Tarantool-patches] [PATCH 1/4] box: improve built-in module load panic message Vladislav Shpilevoy 2020-04-12 20:13 ` [Tarantool-patches] [PATCH 2/4] feedback: move feedback code to the single file Vladislav Shpilevoy 2020-04-12 20:13 ` [Tarantool-patches] [PATCH 3/4] box: yield after initial box_cfg() is finished Vladislav Shpilevoy 2020-04-12 20:13 ` [Tarantool-patches] [PATCH 4/4] feedback: add cmake option to disable the daemon Vladislav Shpilevoy 2020-04-15 17:28 ` Serge Petrenko 2020-04-15 20:04 ` Vladislav Shpilevoy [this message] 2020-04-12 20:19 ` [Tarantool-patches] [PATCH 0/4] CMake option to remove feedback daemon Vladislav Shpilevoy 2020-04-17 7:04 ` Kirill Yukhin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=b2114425-c97a-badf-498f-ccec73ea61e1@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=sergepetrenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 4/4] feedback: add cmake option to disable the daemon' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox