SERVER-47578 Delete util/log.h and remove use of logv1 to logv2 appender

1 files changed, 21 insertions, 103 deletions

diff --git a/src/mongo/db/initialize_server_global_state.cpp b/src/mongo/db/initialize_server_global_state.cpp
index f11bc05257f..f4cf3fb9f19 100644
--- a/src/mongo/db/initialize_server_global_state.cpp
+++ b/src/mongo/db/initialize_server_global_state.cpp
@@ -52,7 +52,6 @@
 #include "mongo/db/server_options.h"
 #include "mongo/logger/console_appender.h"
 #include "mongo/logger/logger.h"
-#include "mongo/logger/logv2_appender.h"
 #include "mongo/logger/message_event.h"
 #include "mongo/logger/message_event_utf8_encoder.h"
 #include "mongo/logger/ramlog.h"
@@ -311,7 +310,6 @@ MONGO_INITIALIZER_GENERAL(ServerLogRedirection,
     using logger::StatusWithRotatableFileWriter;
 
     // Hook up this global into our logging encoder
-    LogManager* manager = logger::globalLogManager();
     auto& lv2Manager = logv2::LogManager::global();
     logv2::LogDomainGlobal::ConfigurationOptions lv2Config;
     MessageEventDetailsEncoder::setMaxLogSizeKBSource(gMaxLogAttributeSizeKB);
@@ -323,33 +321,9 @@ MONGO_INITIALIZER_GENERAL(ServerLogRedirection,
         return Status(ErrorCodes::InternalError,
                       "Syslog requested in Windows build; command line processor logic error");
 #else
-        std::unique_ptr<logger::Appender<MessageEventEphemeral>> appender;
-        std::unique_ptr<logger::Appender<MessageEventEphemeral>> javascriptAppender;
-
-        if (logV2Enabled()) {
-            appender = std::make_unique<logger::LogV2Appender<MessageEventEphemeral>>(
-                &(lv2Manager.getGlobalDomain()), true);
-            javascriptAppender = std::make_unique<logger::LogV2Appender<MessageEventEphemeral>>(
-                &(lv2Manager.getGlobalDomain()), true);
-
-            lv2Config.consoleEnabled = false;
-            lv2Config.syslogEnabled = true;
-            lv2Config.syslogFacility = serverGlobalParams.syslogFacility;
-        } else {
-            using logger::SyslogAppender;
-            StringBuilder sb;
-            sb << serverGlobalParams.binaryName << "." << serverGlobalParams.port;
-            openlog(
-                strdup(sb.str().c_str()), LOG_PID | LOG_CONS, serverGlobalParams.syslogFacility);
-            appender = std::make_unique<SyslogAppender<MessageEventEphemeral>>(
-                std::make_unique<MessageEventDetailsEncoder>());
-            javascriptAppender = std::make_unique<SyslogAppender<MessageEventEphemeral>>(
-                std::make_unique<MessageEventDetailsEncoder>());
-        }
-        manager->getGlobalDomain()->clearAppenders();
-        manager->getGlobalDomain()->attachAppender(std::move(appender));
-        manager->getNamedDomain("plainShellOutput")->attachAppender(std::move(javascriptAppender));
-
+        lv2Config.consoleEnabled = false;
+        lv2Config.syslogEnabled = true;
+        lv2Config.syslogFacility = serverGlobalParams.syslogFacility;
 #endif  // defined(_WIN32)
     } else if (!serverGlobalParams.logpath.empty()) {
         fassert(16448, !serverGlobalParams.logWithSyslog);
@@ -395,83 +369,27 @@ MONGO_INITIALIZER_GENERAL(ServerLogRedirection,
             }
         }
 
-        std::unique_ptr<logger::Appender<MessageEventEphemeral>> appender;
-        std::unique_ptr<logger::Appender<MessageEventEphemeral>> javascriptAppender;
-
-        if (logV2Enabled()) {
-
-            appender = std::make_unique<logger::LogV2Appender<MessageEventEphemeral>>(
-                &(lv2Manager.getGlobalDomain()), true);
-            javascriptAppender = std::make_unique<logger::LogV2Appender<MessageEventEphemeral>>(
-                &(lv2Manager.getGlobalDomain()), true);
-
-            lv2Config.consoleEnabled = false;
-            lv2Config.fileEnabled = true;
-            lv2Config.filePath = absoluteLogpath;
-            lv2Config.fileRotationMode = serverGlobalParams.logRenameOnRotate
-                ? logv2::LogDomainGlobal::ConfigurationOptions::RotationMode::kRename
-                : logv2::LogDomainGlobal::ConfigurationOptions::RotationMode::kReopen;
-            lv2Config.fileOpenMode = serverGlobalParams.logAppend
-                ? logv2::LogDomainGlobal::ConfigurationOptions::OpenMode::kAppend
-                : logv2::LogDomainGlobal::ConfigurationOptions::OpenMode::kTruncate;
-
-            if (serverGlobalParams.logAppend && exists) {
-                writeServerRestartedAfterLogConfig = true;
-            }
-
-        } else {
-            StatusWithRotatableFileWriter writer = logger::globalRotatableFileManager()->openFile(
-                absoluteLogpath, serverGlobalParams.logAppend);
-            if (!writer.isOK()) {
-                return writer.getStatus();
-            }
-            appender = std::make_unique<RotatableFileAppender<MessageEventEphemeral>>(
-                std::make_unique<MessageEventDetailsEncoder>(), writer.getValue());
-            javascriptAppender = std::make_unique<RotatableFileAppender<MessageEventEphemeral>>(
-                std::make_unique<MessageEventDetailsEncoder>(), writer.getValue());
-            if (serverGlobalParams.logAppend && exists) {
-                LOGV2_WARNING_OPTIONS(
-                    20699, {logv2::LogTag::kStartupWarnings}, "***** SERVER RESTARTED *****");
-                Status status = logger::RotatableFileWriter::Use(writer.getValue()).status();
-                if (!status.isOK())
-                    return status;
-            }
-        }
-
-        manager->getGlobalDomain()->clearAppenders();
-        manager->getGlobalDomain()->attachAppender(std::move(appender));
-        manager->getNamedDomain("plainShellOutput")->attachAppender(std::move(javascriptAppender));
-
-    } else {
-        if (logV2Enabled()) {
-            manager->getGlobalDomain()->clearAppenders();
-            manager->getGlobalDomain()->attachAppender(
-                std::make_unique<logger::LogV2Appender<MessageEventEphemeral>>(
-                    &(lv2Manager.getGlobalDomain()), true));
-            manager->getNamedDomain("plainShellOutput")
-                ->attachAppender(std::make_unique<logger::LogV2Appender<MessageEventEphemeral>>(
-                    &(lv2Manager.getGlobalDomain()), true));
-        } else {
-            logger::globalLogManager()
-                ->getNamedDomain("plainShellOutput")
-                ->attachAppender(std::make_unique<logger::ConsoleAppender<MessageEventEphemeral>>(
-                    std::make_unique<MessageEventDetailsEncoder>()));
+        lv2Config.consoleEnabled = false;
+        lv2Config.fileEnabled = true;
+        lv2Config.filePath = absoluteLogpath;
+        lv2Config.fileRotationMode = serverGlobalParams.logRenameOnRotate
+            ? logv2::LogDomainGlobal::ConfigurationOptions::RotationMode::kRename
+            : logv2::LogDomainGlobal::ConfigurationOptions::RotationMode::kReopen;
+        lv2Config.fileOpenMode = serverGlobalParams.logAppend
+            ? logv2::LogDomainGlobal::ConfigurationOptions::OpenMode::kAppend
+            : logv2::LogDomainGlobal::ConfigurationOptions::OpenMode::kTruncate;
+
+        if (serverGlobalParams.logAppend && exists) {
+            writeServerRestartedAfterLogConfig = true;
         }
     }
-    if (!logV2Enabled()) {
-        logger::globalLogDomain()->attachAppender(
-            std::make_unique<RamLogAppender>(RamLog::get("global")));
-    }
 
-
-    if (logV2Enabled()) {
-        lv2Config.timestampFormat = serverGlobalParams.logTimestampFormat;
-        Status result = lv2Manager.getGlobalDomainInternal().configure(lv2Config);
-        if (result.isOK() && writeServerRestartedAfterLogConfig)
-            LOGV2_WARNING_OPTIONS(
-                20698, {logv2::LogTag::kStartupWarnings}, "***** SERVER RESTARTED *****");
-        return result;
-    }
+    lv2Config.timestampFormat = serverGlobalParams.logTimestampFormat;
+    Status result = lv2Manager.getGlobalDomainInternal().configure(lv2Config);
+    if (result.isOK() && writeServerRestartedAfterLogConfig)
+        LOGV2_WARNING_OPTIONS(
+            20698, {logv2::LogTag::kStartupWarnings}, "***** SERVER RESTARTED *****");
+    return result;
 
     return Status::OK();
 }