Skip to content

Commit a00e981

Browse files
JackarainJackarain
committed
Update cmake and improve print logging on release
1 parent fef8407 commit a00e981

File tree

8 files changed

+26
-37
lines changed

8 files changed

+26
-37
lines changed

‎CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,11 @@ if (ENABLE_SYSTEMD_LOGGING)
217217
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_SYSTEMD_LOGGING")
218218
endif()
219219

220+
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLE_XLOGGER")
221+
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DENABLE_XLOGGER -DLOGGER_DBG_VIEW")
222+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DENABLE_XLOGGER -DLOGGER_DBG_VIEW")
223+
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -DENABLE_XLOGGER -DLOGGER_DBG_VIEW")
224+
220225
################################################################################
221226

222227
if (NOT MSVC)

‎example/http_proxy_client/CMakeLists.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
2-
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLE_LOGGER")
3-
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DENABLE_LOGGER -DDISABLE_LOGGER_TO_CONSOLE -DLOGGER_DBG_VIEW")
4-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DENABLE_LOGGER -DDISABLE_LOGGER_TO_CONSOLE -DLOGGER_DBG_VIEW")
5-
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -DENABLE_LOGGER -DDISABLE_LOGGER_TO_CONSOLE -DLOGGER_DBG_VIEW")
1+
# example http_proxy_client
62

73
add_executable(http_proxy_client
84
http_proxy_client.cpp

‎example/nested_proxy/CMakeLists.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
2-
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLE_LOGGER")
3-
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DENABLE_LOGGER -DDISABLE_LOGGER_TO_CONSOLE -DLOGGER_DBG_VIEW")
4-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DENABLE_LOGGER -DDISABLE_LOGGER_TO_CONSOLE -DLOGGER_DBG_VIEW")
5-
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -DENABLE_LOGGER -DDISABLE_LOGGER_TO_CONSOLE -DLOGGER_DBG_VIEW")
1+
# example nested_proxy
62

73
add_executable(nested_proxy
84
nested_proxy.cpp

‎example/socks_client/CMakeLists.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
2-
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLE_LOGGER")
3-
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DENABLE_LOGGER -DDISABLE_LOGGER_TO_CONSOLE -DLOGGER_DBG_VIEW")
4-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DENABLE_LOGGER -DDISABLE_LOGGER_TO_CONSOLE -DLOGGER_DBG_VIEW")
5-
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -DENABLE_LOGGER -DDISABLE_LOGGER_TO_CONSOLE -DLOGGER_DBG_VIEW")
1+
# example socks_client
62

73
add_executable(socks_client
84
socks_client.cpp

‎proxy/CMakeLists.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
cmake_minimum_required(VERSION 3.16)
22
project(libproxy)
33

4-
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLE_LOGGER")
5-
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DENABLE_LOGGER -DDISABLE_LOGGER_TO_CONSOLE -DLOGGER_DBG_VIEW")
6-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DENABLE_LOGGER -DDISABLE_LOGGER_TO_CONSOLE -DLOGGER_DBG_VIEW")
7-
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -DENABLE_LOGGER -DDISABLE_LOGGER_TO_CONSOLE -DLOGGER_DBG_VIEW")
8-
94
add_library(libproxy STATIC)
105

116
target_sources(libproxy

‎proxy/include/proxy/logging.hpp‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -884,12 +884,12 @@ class auto_logger_file__
884884
int64_t m_log_size{ 0 };
885885
};
886886

887-
#ifndef DISABLE_LOGGER_THREAD_SAFE
888-
#define LOGGER_LOCKS_() std::lock_guard \
887+
#ifndef DISABLE_XLOGGER_THREAD_SAFE
888+
#define XLOGGER_LOCKS_() std::lock_guard \
889889
lock(logger_aux__::lock_single<std::mutex>())
890890
#else
891-
#define LOGGER_LOCKS_() ((void)0)
892-
#endif // LOGGER_THREAD_SAFE
891+
#define XLOGGER_LOCKS_() ((void)0)
892+
#endif // DISABLE_XLOGGER_THREAD_SAFE
893893

894894
#ifndef LOGGER_DBG_VIEW_
895895
#if defined(WIN32) && \
@@ -933,12 +933,12 @@ inline void logger_output_console__([[maybe_unused]] const logger_level__& level
933933
{
934934
#if defined(WIN32)
935935

936-
#if !defined(DISABLE_LOGGER_TO_CONSOLE) || !defined(DISABLE_LOGGER_TO_DBGVIEW)
936+
#if !defined(DISABLE_XLOGGER_TO_CONSOLE) || !defined(DISABLE_XLOGGER_TO_DBGVIEW)
937937
std::wstring title = *logger_aux__::utf8_utf16(prefix);
938938
std::wstring msg = *logger_aux__::utf8_utf16(message);
939939
#endif
940940

941-
#if !defined(DISABLE_LOGGER_TO_CONSOLE)
941+
#if !defined(DISABLE_XLOGGER_TO_CONSOLE)
942942
HANDLE handle_stdout = GetStdHandle(STD_OUTPUT_HANDLE);
943943
CONSOLE_SCREEN_BUFFER_INFO csbi;
944944
GetConsoleScreenBufferInfo(handle_stdout, &csbi);
@@ -973,11 +973,11 @@ inline void logger_output_console__([[maybe_unused]] const logger_level__& level
973973
SetConsoleTextAttribute(handle_stdout, csbi.wAttributes);
974974
#endif
975975

976-
#if !defined(DISABLE_LOGGER_TO_DBGVIEW)
976+
#if !defined(DISABLE_XLOGGER_TO_DBGVIEW)
977977
LOGGER_DBG_VIEW_(title + msg);
978978
#endif
979979

980-
#elif !defined(DISABLE_LOGGER_TO_CONSOLE)
980+
#elif !defined(DISABLE_XLOGGER_TO_CONSOLE)
981981
std::string out;
982982

983983
switch (level)
@@ -1091,7 +1091,7 @@ inline void logger_writer__(int64_t time, const logger_level__& level,
10911091
const std::string& message,
10921092
[[maybe_unused]] bool disable_cout = false) noexcept
10931093
{
1094-
LOGGER_LOCKS_();
1094+
XLOGGER_LOCKS_();
10951095
static auto& logger = xlogger::logger_aux__::writer_single<
10961096
xlogger::auto_logger_file__>();
10971097
char ts[64] = { 0 };
@@ -1853,8 +1853,7 @@ class empty_logger___
18531853
};
18541854
} // namespace xlogger
18551855

1856-
#if (defined(DEBUG) || defined(_DEBUG) || \
1857-
defined(ENABLE_LOGGER)) && !defined(DISABLE_LOGGER)
1856+
#if (!defined(NDEBUG) || defined(ENABLE_XLOGGER)) && !defined(DISABLE_XLOGGER)
18581857

18591858
// API for logging.
18601859
namespace xlogger {

‎server/proxy_server/CMakeLists.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
2-
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLE_LOGGER")
3-
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DENABLE_LOGGER -DDISABLE_LOGGER_TO_CONSOLE -DLOGGER_DBG_VIEW")
4-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DENABLE_LOGGER -DDISABLE_LOGGER_TO_CONSOLE -DLOGGER_DBG_VIEW")
5-
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -DENABLE_LOGGER -DDISABLE_LOGGER_TO_CONSOLE -DLOGGER_DBG_VIEW")
1+
# proxy server
62

73
add_executable(proxy_server
84
main.cpp

‎server/proxy_server/main.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,12 @@ int main(int argc, char** argv)
331331

332332
std::string config;
333333

334+
#ifdef NDEBUG
335+
const bool default_logs = true;
336+
#else
337+
const bool default_logs = false;
338+
#endif
339+
334340
po::options_description desc("Options");
335341
desc.add_options()
336342
("help,h", "Help message.")
@@ -377,7 +383,7 @@ int main(int argc, char** argv)
377383
("autoindex", po::value<bool>(&autoindex)->default_value(false, "false"), "Enable directory listing.")
378384
("logs_path", po::value<std::string>(&log_dir)->value_name(""), "Specify directory for log files.")
379385

380-
("disable_logs", po::value<bool>(&disable_logs)->value_name("")->default_value(false), "Disable logging.")
386+
("disable_logs", po::value<bool>(&disable_logs)->value_name("")->default_value(default_logs), "Disable print logging in screen.")
381387
("disable_http", po::value<bool>(&disable_http)->value_name("")->default_value(false, "false"), "Disable HTTP protocol.")
382388
("disable_socks", po::value<bool>(&disable_socks)->value_name("")->default_value(false, "false"), "Disable SOCKS proxy protocol.")
383389
("disable_udp", po::value<bool>(&disable_udp)->value_name("")->default_value(false, "false"), "Disable UDP protocol.")

0 commit comments

Comments
 (0)