Merge pull request #397 from evoskuil/master

Add application_defined level, disable log_log logging.
libbitcoin · May 8, 2024 · cddeec3 · cddeec3
2 parents 0ec5736 + ef2110d
commit cddeec3
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 27 deletions.
diff --git a/include/bitcoin/network/log/levels.hpp b/include/bitcoin/network/log/levels.hpp
@@ -43,6 +43,7 @@ enum : uint8_t
 };
 
 #if defined(HAVE_LOGGING)
+    constexpr auto application_defined = true;
     #define LOG_ONLY(name) name
     #define LOG(level_, message) \
         BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT) \
@@ -52,6 +53,7 @@ enum : uint8_t
         log.write(network::levels::application) << name \
             << network::levels::level_ << std::endl;
 #else
+    constexpr auto application_defined = false;
     #define LOG_ONLY(name)
     #define LOG(level, message)
     #define LOG_LOG(level_, message)

diff --git a/install-cmake.sh b/install-cmake.sh
@@ -530,7 +530,7 @@ unpack_from_tarball()
     local COMPRESSION=$3
     local BUILD=$4
 
-    display_heading_message "Prepairing to aquire $ARCHIVE"
+    display_heading_message "Preparing to acquire $ARCHIVE"
 
     if [[ ! ($BUILD) ]]; then
         display_message "Skipping unpack of $ARCHIVE..."
@@ -576,7 +576,7 @@ build_from_tarball()
         return
     fi
 
-    display_heading_message "Prepairing to build $ARCHIVE"
+    display_heading_message "Preparing to build $ARCHIVE"
 
     # Because ICU tools don't know how to locate internal dependencies.
     if [[ ($ARCHIVE == "$ICU_ARCHIVE") ]]; then
@@ -634,7 +634,7 @@ create_from_github()
 
     FORK="$ACCOUNT/$REPO"
 
-    display_heading_message "Prepairing to aquire $FORK/$BRANCH"
+    display_heading_message "Preparing to acquire $FORK/$BRANCH"
 
     if [[ -d "$REPO" ]]; then
         if [[ true ]]; then
@@ -669,7 +669,7 @@ build_from_github()
     # Join generated and command line options.
     local CONFIGURATION=("${OPTIONS[@]}" "$@")
 
-    display_heading_message "Prepairing to build $REPO"
+    display_heading_message "Preparing to build $REPO"
 
     # Build the local repository clone.
     make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -737,7 +737,7 @@ build_from_github_cmake()
     # Join generated and command line options.
     local CONFIGURATION=("${OPTIONS[@]}" "$@")
 
-    display_heading_message "Prepairing to build $REPO"
+    display_heading_message "Preparing to build $REPO"
 
     # Build the local repository clone.
     cmake_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -823,7 +823,7 @@ build_from_tarball_boost()
         return
     fi
 
-    display_heading_message "Prepairing to build $ARCHIVE"
+    display_heading_message "Preparing to build $ARCHIVE"
 
     local TARGET="build-$ARCHIVE"
 

diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh
@@ -582,7 +582,7 @@ unpack_from_tarball()
     local COMPRESSION=$3
     local BUILD=$4
 
-    display_heading_message "Prepairing to aquire $ARCHIVE"
+    display_heading_message "Preparing to acquire $ARCHIVE"
 
     if [[ ! ($BUILD) ]]; then
         display_message "Skipping unpack of $ARCHIVE..."
@@ -628,7 +628,7 @@ build_from_tarball()
         return
     fi
 
-    display_heading_message "Prepairing to build $ARCHIVE"
+    display_heading_message "Preparing to build $ARCHIVE"
 
     # Because ICU tools don't know how to locate internal dependencies.
     if [[ ($ARCHIVE == "$ICU_ARCHIVE") ]]; then
@@ -686,7 +686,7 @@ create_from_github()
 
     FORK="$ACCOUNT/$REPO"
 
-    display_heading_message "Prepairing to aquire $FORK/$BRANCH"
+    display_heading_message "Preparing to acquire $FORK/$BRANCH"
 
     if [[ -d "$REPO" ]]; then
         if [[ true ]]; then
@@ -721,7 +721,7 @@ build_from_github()
     # Join generated and command line options.
     local CONFIGURATION=("${OPTIONS[@]}" "$@")
 
-    display_heading_message "Prepairing to build $REPO"
+    display_heading_message "Preparing to build $REPO"
 
     # Build the local repository clone.
     make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -797,7 +797,7 @@ build_from_github_cmake()
     # Join generated and command line options.
     local CONFIGURATION=("${OPTIONS[@]}" "$@")
 
-    display_heading_message "Prepairing to build $REPO"
+    display_heading_message "Preparing to build $REPO"
 
     # Build the local repository clone.
     cmake_project_directory "$REPO" "$PRESET" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -883,7 +883,7 @@ build_from_tarball_boost()
         return
     fi
 
-    display_heading_message "Prepairing to build $ARCHIVE"
+    display_heading_message "Preparing to build $ARCHIVE"
 
     local TARGET="build-$ARCHIVE"
 

diff --git a/install.sh b/install.sh
@@ -473,7 +473,7 @@ unpack_from_tarball()
     local COMPRESSION=$3
     local BUILD=$4
 
-    display_heading_message "Prepairing to aquire $ARCHIVE"
+    display_heading_message "Preparing to acquire $ARCHIVE"
 
     if [[ ! ($BUILD) ]]; then
         display_message "Skipping unpack of $ARCHIVE..."
@@ -519,7 +519,7 @@ build_from_tarball()
         return
     fi
 
-    display_heading_message "Prepairing to build $ARCHIVE"
+    display_heading_message "Preparing to build $ARCHIVE"
 
     # Because ICU tools don't know how to locate internal dependencies.
     if [[ ($ARCHIVE == "$ICU_ARCHIVE") ]]; then
@@ -577,7 +577,7 @@ create_from_github()
 
     FORK="$ACCOUNT/$REPO"
 
-    display_heading_message "Prepairing to aquire $FORK/$BRANCH"
+    display_heading_message "Preparing to acquire $FORK/$BRANCH"
 
     if [[ -d "$REPO" ]]; then
         if [[ true ]]; then
@@ -612,7 +612,7 @@ build_from_github()
     # Join generated and command line options.
     local CONFIGURATION=("${OPTIONS[@]}" "$@")
 
-    display_heading_message "Prepairing to build $REPO"
+    display_heading_message "Preparing to build $REPO"
 
     # Build the local repository clone.
     make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -698,7 +698,7 @@ build_from_tarball_boost()
         return
     fi
 
-    display_heading_message "Prepairing to build $ARCHIVE"
+    display_heading_message "Preparing to build $ARCHIVE"
 
     local TARGET="build-$ARCHIVE"
 

diff --git a/src/p2p.cpp b/src/p2p.cpp
@@ -52,16 +52,17 @@ p2p::p2p(const settings& settings, const logger& log) NOEXCEPT
 {
     BC_ASSERT_MSG(!is_zero(settings.threads), "empty threadpool");
 
-    LOG_LOG("News logging compiled....: ", news_defined);
-    LOG_LOG("Session logging compiled.: ", session_defined);
-    LOG_LOG("Protocol logging compiled: ", protocol_defined);
-    LOG_LOG("ProXy logging compiled...: ", proxy_defined);
-    LOG_LOG("Wire logging compiled....: ", wire_defined);
-    LOG_LOG("Remote logging compiled..: ", remote_defined);
-    LOG_LOG("Fault logging compiled...: ", fault_defined);
-    LOG_LOG("Quit logging compiled....: ", quit_defined);
-    LOG_LOG("Object logging compiled..: ", objects_defined);
-    LOG_LOG("Verbose logging compiled.: ", verbose_defined);
+    ////LOG_LOG("Aplication log compiled..: ", news_defined);
+    ////LOG_LOG("News log compiled........: ", news_defined);
+    ////LOG_LOG("Session log compiled.....: ", session_defined);
+    ////LOG_LOG("Protocol log compiled....: ", protocol_defined);
+    ////LOG_LOG("ProXy log compiled.......: ", proxy_defined);
+    ////LOG_LOG("Wire log compiled........: ", wire_defined);
+    ////LOG_LOG("Remote log compiled......: ", remote_defined);
+    ////LOG_LOG("Fault log compiled.......: ", fault_defined);
+    ////LOG_LOG("Quit log compiled........: ", quit_defined);
+    ////LOG_LOG("Object log compiled......: ", objects_defined);
+    ////LOG_LOG("Verbose log compiled.....: ", verbose_defined);
 }
 
 p2p::~p2p() NOEXCEPT