Skip to content

Remove scrap log object dead code #7935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bneradt merged 1 commit into from
Jun 10, 2021
Merged

Remove scrap log object dead code #7935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions proxy/logging/Log.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 0 additions & 2 deletions proxy/logging/Log.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,6 @@ class Log
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
Expand Down