[trafficserver] branch 9.1.x updated: Remove scrap log object dead code (#7935)

[zwoop]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.1.x by this push:
     new eef464e  Remove scrap log object dead code (#7935)
eef464e is described below

commit eef464ef05da6d0e035cec59daa02b2bfb67337d
Author: Brian Neradt <brian.ner...@gmail.com>
AuthorDate: Thu Jun 10 17:05:19 2021 -0500

    Remove scrap log object dead code (#7935)
    
    The scrap log object was a part of log collation, which was removed in
    commit:
    82d564486e058ead160bfb8ad15e40b0507ff8aa
    
    This object is therefore no longer needed and is not used. This commit
    removes it.
    
    (cherry picked from commit a20db3c5e80f2cd705cd6d3db312a7cfce91277c)
---
 proxy/logging/Log.cc | 18 +-----------------
 proxy/logging/Log.h  |  2 --
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/proxy/logging/Log.cc b/proxy/logging/Log.cc
index 5022eb0..6855c22 100644
--- a/proxy/logging/Log.cc
+++ b/proxy/logging/Log.cc
@@ -58,9 +58,7 @@
 // Log global objects
 inkcoreapi LogObject *Log::error_log = nullptr;
 LogFieldList Log::global_field_list;
-LogFormat *Log::global_scrap_format = nullptr;
-LogObject *Log::global_scrap_object = nullptr;
-Log::LoggingMode Log::logging_mode  = LOG_MODE_NONE;
+Log::LoggingMode Log::logging_mode = LOG_MODE_NONE;
 
 // Flush thread stuff
 EventNotify *Log::preproc_notify;
@@ -241,18 +239,12 @@ Log::periodic_tasks(long time_now)
       if (error_log) {
         error_log->roll_files(time_now);
       }
-      if (global_scrap_object) {
-        global_scrap_object->roll_files(time_now);
-      }
       Log::config->log_object_manager.roll_files(time_now);
       Log::config->roll_log_files_now = false;
     } else {
       if (error_log) {
         error_log->roll_files(time_now);
       }
-      if (global_scrap_object) {
-        global_scrap_object->roll_files(time_now);
-      }
       Log::config->log_object_manager.roll_files(time_now);
     }
     if (log_rotate_signal_received) {
@@ -1085,14 +1077,6 @@ Log::init_when_enabled()
     }
 
     LogConfig::register_mgmt_callbacks();
-    // setup global scrap object
-    //
-    global_scrap_format = MakeTextLogFormat();
-    global_scrap_object =
-      new LogObject(Log::config, global_scrap_format, 
Log::config->logfile_dir, "scrapfile.log", LOG_FILE_BINARY, nullptr,
-                    Log::config->rolling_enabled, 
Log::config->preproc_threads, Log::config->rolling_interval_sec,
-                    Log::config->rolling_offset_hr, 
Log::config->rolling_size_mb,
-                    /* auto create */ false, Log::config->rolling_max_count, 
Log::config->rolling_min_count);
 
     // create the flush thread
     create_threads();
diff --git a/proxy/logging/Log.h b/proxy/logging/Log.h
index 50c4323..761f3c5 100644
--- a/proxy/logging/Log.h
+++ b/proxy/logging/Log.h
@@ -190,8 +190,6 @@ public:
   static LogConfig *config;
   static LogFieldList global_field_list;
   static std::unordered_map<std::string, LogField *> field_symbol_hash;
-  static LogFormat *global_scrap_format;
-  static LogObject *global_scrap_object;
   static LoggingMode logging_mode;
 
   // logging thread stuff