Replace local StdErrLogger with get_default_logger()

realm · Aug 23, 2023 · b88edbb · b88edbb
1 parent 6596065
commit b88edbb
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 46 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ CMakeScripts
 # Ignore build artifacts
 /build*
 /debug*
+/release*
 
 # Ignore all user files except one which includes execution path for test
 *.user

diff --git a/src/realm/sync/noinst/client_impl_base.cpp b/src/realm/sync/noinst/client_impl_base.cpp
@@ -136,7 +136,7 @@ bool ClientImpl::decompose_server_url(const std::string& url, ProtocolEnvelope&
 
 
 ClientImpl::ClientImpl(ClientConfig config)
-    : logger_ptr{config.logger ? std::move(config.logger) : std::make_shared<util::StderrLogger>()}
+    : logger_ptr{config.logger ? std::move(config.logger) : util::Logger::get_default_logger()}
     , logger{*logger_ptr}
     , m_reconnect_mode{config.reconnect_mode}
     , m_connect_timeout{config.connect_timeout}

diff --git a/src/realm/sync/noinst/server/server.cpp b/src/realm/sync/noinst/server/server.cpp
@@ -3822,7 +3822,7 @@ void Worker::stop() noexcept
 
 
 ServerImpl::ServerImpl(const std::string& root_dir, util::Optional<sync::PKey> pkey, Server::Config config)
-    : logger_ptr{config.logger ? std::move(config.logger) : std::make_shared<util::StderrLogger>()}
+    : logger_ptr{config.logger ? std::move(config.logger) : Logger::get_default_logger()}
     , logger{*logger_ptr}
     , m_config{std::move(config)}
     , m_max_upload_backlog{determine_max_upload_backlog(config)}

diff --git a/test/object-store/audit.cpp b/test/object-store/audit.cpp
@@ -41,6 +41,8 @@
 #include <realm/object-store/sync/mongo_database.hpp>
 #include <realm/object-store/sync/mongo_collection.hpp>
 
+#include <realm/util/logger.hpp>
+
 #include <catch2/catch_all.hpp>
 
 #include <external/json/json.hpp>
@@ -320,8 +322,7 @@ TEST_CASE("audit object serialization", "[sync][pbs][audit]") {
     config.audit_config = std::make_shared<AuditConfig>();
     auto serializer = std::make_shared<CustomSerializer>();
     config.audit_config->serializer = serializer;
-    config.audit_config->logger =
-        std::make_shared<util::ThreadSafeLogger>(std::make_shared<util::StderrLogger>(AUDIT_LOG_LEVEL));
+    config.audit_config->logger = std::make_shared<util::ThreadSafeLogger>(util::Logger::get_default_logger());
     auto realm = Realm::get_shared_realm(config);
     auto audit = realm->audit_context();
     REQUIRE(audit);
@@ -1507,7 +1508,7 @@ TEST_CASE("audit realm sharding", "[sync][pbs][audit]") {
         {"object", {{"_id", PropertyType::Int, Property::IsPrimary{true}}, {"value", PropertyType::Int}}},
     };
     config.audit_config = std::make_shared<AuditConfig>();
-    auto logger = std::make_shared<util::StderrLogger>(AUDIT_LOG_LEVEL);
+    auto logger = util::Logger::get_default_logger();
     config.audit_config->logger = std::make_shared<util::ThreadSafeLogger>(logger);
     auto realm = Realm::get_shared_realm(config);
     auto audit = realm->audit_context();
@@ -1695,8 +1696,7 @@ TEST_CASE("audit integration tests", "[sync][pbs][audit][baas]") {
     SyncTestFile config(session.app()->current_user(), bson::Bson("default"));
     config.schema = schema;
     config.audit_config = std::make_shared<AuditConfig>();
-    config.audit_config->logger =
-        std::make_shared<util::ThreadSafeLogger>(std::make_shared<util::StderrLogger>(AUDIT_LOG_LEVEL));
+    config.audit_config->logger = std::make_shared<util::ThreadSafeLogger>(util::Logger::get_default_logger());
 
     auto expect_error = [&](auto&& config, auto&& fn) -> SyncError {
         std::mutex mutex;

diff --git a/test/object-store/c_api/c_api.cpp b/test/object-store/c_api/c_api.cpp
@@ -5437,11 +5437,11 @@ static void realm_app_user2(void* p, realm_user_t* user, const realm_app_error_t
 TEST_CASE("C API app: link_user integration w/c_api transport", "[sync][app][c_api][baas]") {
     struct TestTransportUserData {
         TestTransportUserData()
-            : logger(std::make_unique<util::StderrLogger>(realm::util::Logger::Level::TEST_LOGGING_LEVEL))
+            : logger(util::Logger::get_default_logger())
             , transport(std::make_unique<SynchronousTestTransport>())
         {
         }
-        std::unique_ptr<util::Logger> logger;
+        std::shared_ptr<util::Logger> logger;
         std::unique_ptr<realm::app::GenericNetworkTransport> transport;
     };
 
@@ -6198,8 +6198,7 @@ TEST_CASE("C API app: websocket provider", "[sync][app][c_api][baas]") {
         int free_count = 0;
     };
 
-    auto logger = std::make_shared<util::StderrLogger>();
-    DefaultSocketProvider default_socket_provider(logger, "SocketProvider");
+    DefaultSocketProvider default_socket_provider(util::Logger::get_default_logger(), "SocketProvider");
 
     auto free_fn = [](realm_userdata_t user_ptr) {
         auto test_data = static_cast<TestData*>(user_ptr);

diff --git a/test/object-store/sync/app.cpp b/test/object-store/sync/app.cpp
@@ -2187,7 +2187,7 @@ TEST_CASE("app: make distributable client file", "[sync][pbs][app][baas]") {
 }
 
 TEST_CASE("app: sync integration", "[sync][pbs][app][baas]") {
-    auto logger = std::make_shared<util::StderrLogger>(realm::util::Logger::Level::TEST_LOGGING_LEVEL);
+    auto logger = util::Logger::get_default_logger();
 
     const auto schema = default_app_config("").schema;
 

diff --git a/test/object-store/sync/flx_migration.cpp b/test/object-store/sync/flx_migration.cpp
@@ -114,8 +114,7 @@ static std::vector<ObjectId> fill_test_data(SyncTestFile& config, std::optional<
 
 
 TEST_CASE("Test server migration and rollback", "[sync][flx][flx migration][baas]") {
-    std::shared_ptr<util::Logger> logger_ptr =
-        std::make_shared<util::StderrLogger>(realm::util::Logger::Level::TEST_LOGGING_LEVEL);
+    auto logger_ptr = util::Logger::get_default_logger();
 
     const std::string base_url = get_base_url();
     const std::string partition1 = "migration-test";
@@ -264,8 +263,7 @@ TEST_CASE("Test server migration and rollback", "[sync][flx][flx migration][baas
 }
 
 TEST_CASE("Test client migration and rollback", "[sync][flx][flx migration][baas]") {
-    std::shared_ptr<util::Logger> logger_ptr =
-        std::make_shared<util::StderrLogger>(realm::util::Logger::Level::TEST_LOGGING_LEVEL);
+    auto logger_ptr = util::Logger::get_default_logger();
 
     const std::string base_url = get_base_url();
     const std::string partition = "migration-test";
@@ -321,8 +319,7 @@ TEST_CASE("Test client migration and rollback", "[sync][flx][flx migration][baas
 }
 
 TEST_CASE("Test client migration and rollback with recovery", "[sync][flx][flx migration][baas]") {
-    std::shared_ptr<util::Logger> logger_ptr =
-        std::make_shared<util::StderrLogger>(realm::util::Logger::Level::TEST_LOGGING_LEVEL);
+    auto logger_ptr = util::Logger::get_default_logger();
 
     const std::string base_url = get_base_url();
     const std::string partition = "migration-test";
@@ -473,8 +470,7 @@ TEST_CASE("Test client migration and rollback with recovery", "[sync][flx][flx m
 
 TEST_CASE("An interrupted migration or rollback can recover on the next session",
           "[sync][flx][flx migration][baas]") {
-    std::shared_ptr<util::Logger> logger_ptr =
-        std::make_shared<util::StderrLogger>(realm::util::Logger::Level::TEST_LOGGING_LEVEL);
+    auto logger_ptr = util::Logger::get_default_logger();
 
     const std::string base_url = get_base_url();
     const std::string partition = "migration-test";
@@ -585,8 +581,7 @@ TEST_CASE("An interrupted migration or rollback can recover on the next session"
 }
 
 TEST_CASE("Update to native FLX after migration", "[sync][flx][flx migration][baas]") {
-    std::shared_ptr<util::Logger> logger_ptr =
-        std::make_shared<util::StderrLogger>(realm::util::Logger::Level::TEST_LOGGING_LEVEL);
+    auto logger_ptr = util::Logger::get_default_logger();
 
     const std::string base_url = get_base_url();
     const std::string partition = "migration-test";
@@ -705,8 +700,7 @@ TEST_CASE("Update to native FLX after migration", "[sync][flx][flx migration][ba
 }
 
 TEST_CASE("New table is synced after migration", "[sync][flx][flx migration][baas]") {
-    std::shared_ptr<util::Logger> logger_ptr =
-        std::make_shared<util::StderrLogger>(realm::util::Logger::Level::TEST_LOGGING_LEVEL);
+    auto logger_ptr = util::Logger::get_default_logger();
 
     const std::string base_url = get_base_url();
     const std::string partition = "migration-test";
@@ -814,8 +808,7 @@ TEST_CASE("New table is synced after migration", "[sync][flx][flx migration][baa
 // a subset of the one found on disk. Since it is not, a schema exception is thrown
 // which is eventually forwarded to the sync error handler and client reset fails.
 TEST_CASE("Async open + client reset", "[sync][flx][flx migration][baas]") {
-    std::shared_ptr<util::Logger> logger_ptr =
-        std::make_shared<util::StderrLogger>(realm::util::Logger::Level::TEST_LOGGING_LEVEL);
+    auto logger_ptr = util::Logger::get_default_logger();
 
     const std::string base_url = get_base_url();
     const std::string partition = "async-open-migration-test";

diff --git a/test/object-store/sync/flx_sync.cpp b/test/object-store/sync/flx_sync.cpp
@@ -2604,8 +2604,8 @@ TEST_CASE("flx: bootstrap batching prevents orphan documents", "[sync][flx][boot
             DBOptions options;
             options.encryption_key = test_util::crypt_key();
             auto realm = DB::create(sync::make_client_replication(), interrupted_realm_config.path, options);
-            util::StderrLogger logger;
-            sync::PendingBootstrapStore bootstrap_store(realm, logger);
+            auto logger = util::Logger::get_default_logger();
+            sync::PendingBootstrapStore bootstrap_store(realm, *logger);
             REQUIRE(bootstrap_store.has_pending());
             auto pending_batch = bootstrap_store.peek_pending(1024 * 1024 * 16);
             REQUIRE(pending_batch.query_version == 1);
@@ -2673,8 +2673,8 @@ TEST_CASE("flx: bootstrap batching prevents orphan documents", "[sync][flx][boot
             DBOptions options;
             options.encryption_key = test_util::crypt_key();
             auto realm = DB::create(sync::make_client_replication(), interrupted_realm_config.path, options);
-            util::StderrLogger logger;
-            sync::PendingBootstrapStore bootstrap_store(realm, logger);
+            auto logger = util::Logger::get_default_logger();
+            sync::PendingBootstrapStore bootstrap_store(realm, *logger);
             REQUIRE(bootstrap_store.has_pending());
             auto pending_batch = bootstrap_store.peek_pending(1024 * 1024 * 16);
             REQUIRE(pending_batch.query_version == 1);
@@ -2752,8 +2752,8 @@ TEST_CASE("flx: bootstrap batching prevents orphan documents", "[sync][flx][boot
             DBOptions options;
             options.encryption_key = test_util::crypt_key();
             auto realm = DB::create(sync::make_client_replication(), interrupted_realm_config.path, options);
-            util::StderrLogger logger;
-            sync::PendingBootstrapStore bootstrap_store(realm, logger);
+            auto logger = util::Logger::get_default_logger();
+            sync::PendingBootstrapStore bootstrap_store(realm, *logger);
             REQUIRE(bootstrap_store.has_pending());
             auto pending_batch = bootstrap_store.peek_pending(1024 * 1024 * 16);
             REQUIRE(pending_batch.query_version == 1);

diff --git a/test/object-store/util/sync/sync_test_utils.cpp b/test/object-store/util/sync/sync_test_utils.cpp
@@ -379,10 +379,11 @@ struct FakeLocalClientReset : public TestClientReset {
             sync::SaltedFileIdent fake_ident{1, 123456789};
             auto local_db = TestHelper::get_db(local_realm);
             auto remote_db = TestHelper::get_db(remote_realm);
-            util::StderrLogger logger(realm::util::Logger::Level::TEST_LOGGING_LEVEL);
+            auto logger = util::Logger::get_default_logger();
+
             using _impl::client_reset::perform_client_reset_diff;
             constexpr bool recovery_is_allowed = true;
-            perform_client_reset_diff(local_db, remote_db, fake_ident, logger, m_mode, recovery_is_allowed, nullptr,
+            perform_client_reset_diff(local_db, remote_db, fake_ident, *logger, m_mode, recovery_is_allowed, nullptr,
                                       nullptr, nullptr);
 
             remote_realm->close();

diff --git a/test/object-store/util/test_file.cpp b/test/object-store/util/test_file.cpp
@@ -196,8 +196,8 @@ SyncServer::SyncServer(const SyncServer::Config& config)
                    using namespace std::literals::chrono_literals;
 
 #if TEST_ENABLE_LOGGING
-                   auto logger = new util::StderrLogger(realm::util::Logger::Level::TEST_LOGGING_LEVEL);
-                   m_logger.reset(logger);
+                   m_logger = util::Logger::get_default_logger();
+
 #else
                    // Logging is disabled, use a NullLogger to prevent printing anything
                    m_logger.reset(new util::NullLogger());

diff --git a/test/test_sync.cpp b/test/test_sync.cpp
@@ -6644,10 +6644,10 @@ TEST(Sync_NonIncreasingServerVersions)
 
     uint_fast64_t downloadable_bytes = 0;
     VersionInfo version_info;
-    util::StderrLogger logger;
+    auto logger = util::Logger::get_default_logger();
     auto transact = db->start_read();
     history.integrate_server_changesets(progress, &downloadable_bytes, server_changesets_encoded, version_info,
-                                        DownloadBatchState::SteadyState, logger, transact);
+                                        DownloadBatchState::SteadyState, *logger, transact);
 }
 
 TEST(Sync_InvalidChangesetFromServer)
@@ -6672,10 +6672,10 @@ TEST(Sync_InvalidChangesetFromServer)
     server_changeset.data = BinaryData(encoded.data(), encoded.size());
 
     VersionInfo version_info;
-    util::StderrLogger logger;
+    auto logger = util::Logger::get_default_logger();
     auto transact = db->start_read();
     CHECK_THROW_EX(history.integrate_server_changesets({}, nullptr, util::Span(&server_changeset, 1), version_info,
-                                                       DownloadBatchState::SteadyState, logger, transact),
+                                                       DownloadBatchState::SteadyState, *logger, transact),
                    sync::IntegrationException,
                    StringData(e.what()).contains("Failed to parse received changeset: Invalid interned string"));
 }
@@ -6791,10 +6791,10 @@ TEST(Sync_SetAndGetEmptyReciprocalChangeset)
 
     uint_fast64_t downloadable_bytes = 0;
     VersionInfo version_info;
-    util::StderrLogger logger;
+    auto logger = util::Logger::get_default_logger();
     auto transact = db->start_read();
     history.integrate_server_changesets(progress, &downloadable_bytes, server_changesets_encoded, version_info,
-                                        DownloadBatchState::SteadyState, logger, transact);
+                                        DownloadBatchState::SteadyState, *logger, transact);
 
     bool is_compressed = false;
     auto data = history.get_reciprocal_transform(latest_local_version, is_compressed);
@@ -6937,10 +6937,10 @@ TEST(Sync_ServerVersionsSkippedFromDownloadCursor)
 
     uint_fast64_t downloadable_bytes = 0;
     VersionInfo version_info;
-    util::StderrLogger logger;
+    auto logger = util::Logger::get_default_logger();
     auto transact = db->start_read();
     history.integrate_server_changesets(progress, &downloadable_bytes, server_changesets_encoded, version_info,
-                                        DownloadBatchState::SteadyState, logger, transact);
+                                        DownloadBatchState::SteadyState, *logger, transact);
 
     version_type current_version;
     SaltedFileIdent file_ident;

diff --git a/test/util/test_path.cpp b/test/util/test_path.cpp
@@ -327,7 +327,8 @@ std::shared_ptr<DB> get_test_db(const std::string& path, const char* crypt_key)
     }
 
     DBOptions options;
-    options.logger = std::make_shared<util::StderrLogger>(core_log_level);
+    util::Logger::set_default_level_threshold(core_log_level);
+    options.logger = util::Logger::get_default_logger();
     options.encryption_key = crypt_key;
     return DB::create(make_in_realm_history(), path, options);
 }

diff --git a/test/util/unit_test.cpp b/test/util/unit_test.cpp
@@ -524,7 +524,7 @@ bool TestList::run(Config config)
             root_logger = std::make_shared<util::TimestampStderrLogger>(std::move(config)); // Throws
         }
         else {
-            root_logger = std::make_shared<util::StderrLogger>(); // Throws
+            root_logger = util::Logger::get_default_logger(); // Throws
         }
     }
     std::shared_ptr<util::Logger> shared_logger = std::make_shared<util::ThreadSafeLogger>(root_logger);