From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp33.i.mail.ru (smtp33.i.mail.ru [94.100.177.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 748A14696C3 for ; Wed, 15 Apr 2020 23:04:55 +0300 (MSK) References: <8DB58B24-A230-4CFA-8FEB-10073767D364@tarantool.org> From: Vladislav Shpilevoy Message-ID: Date: Wed, 15 Apr 2020 22:04:51 +0200 MIME-Version: 1.0 In-Reply-To: <8DB58B24-A230-4CFA-8FEB-10073767D364@tarantool.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Tarantool-patches] [PATCH 4/4] feedback: add cmake option to disable the daemon List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Serge Petrenko Cc: tarantool-patches@dev.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) ====================