Initialize test logs in constructor

4 files changed, 24 insertions, 16 deletions

diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/retry_policy_ut.cpp b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/retry_policy_ut.cpp
index 4d4ec9e2a8c..a2e94455350 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/retry_policy_ut.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/retry_policy_ut.cpp
@@ -151,13 +151,13 @@ Y_UNIT_TEST_SUITE(RetryPolicy) {
     }
 
     Y_UNIT_TEST(TWriteSession_SeqNoShift) {
-        auto setup1 = std::make_shared<TPersQueueYdbSdkTestSetup>(TEST_CASE_NAME, false);
-        SDKTestSetup setup2("SeqNoShift_Dc2", false);
+        auto setup1 = std::make_shared<TPersQueueYdbSdkTestSetup>(TEST_CASE_NAME, false, TTestServer::LOGGED_SERVICES, NActors::NLog::PRI_TRACE);
+        SDKTestSetup setup2("SeqNoShift_Dc2", false, TTestServer::LOGGED_SERVICES, NActors::NLog::PRI_TRACE);
         setup2.SetSingleDataCenter("dc2");
         setup2.AddDataCenter("dc1", *setup1, true);
-        setup2.Start(true, false, TTestServer::LOGGED_SERVICES, NActors::NLog::PRI_TRACE);
+        setup2.Start(true, false);
         setup1->AddDataCenter("dc2", setup2, true);
-        setup1->Start(true, false, TTestServer::LOGGED_SERVICES, NActors::NLog::PRI_TRACE);
+        setup1->Start(true, false);
 
         TString sourceId1 = SDKTestSetup::GetTestMessageGroupId() + "1";
         TString sourceId2 = SDKTestSetup::GetTestMessageGroupId() + "2";
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/sdk_test_setup.h b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/sdk_test_setup.h
index 7fb6e751e3a..1c6214d3746 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/sdk_test_setup.h
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/sdk_test_setup.h
@@ -15,13 +15,14 @@ protected:
     THolder<TTempFileHandle> NetDataFile;
     THashMap<TString, NKikimr::NPersQueueTests::TPQTestClusterInfo> DataCenters;
     TString LocalDC = "dc1";
-    TTestServer Server = TTestServer(false /* don't start */);
-
+    TTestServer Server;
     TLog Log = TLog("cerr");
 
 public:
-    SDKTestSetup(const TString& testCaseName, bool start = true)
-        : TestCaseName(testCaseName)
+    SDKTestSetup(const TString& testCaseName, bool start = true,
+                 const TVector<NKikimrServices::EServiceKikimr>& logServices = TTestServer::LOGGED_SERVICES, NActors::NLog::EPriority logPriority = NActors::NLog::PRI_DEBUG)
+        : TestCaseName(testCaseName) 
+        , Server(false, Nothing(), logServices, logPriority)
     {
         InitOptions();
         if (start) {
@@ -59,10 +60,8 @@ public:
         std::srand(seed);
     }
 
-    void Start(bool waitInit = true, bool addBrokenDatacenter = false, 
-            const TVector<NKikimrServices::EServiceKikimr>& logServices = TTestServer::LOGGED_SERVICES, NActors::NLog::EPriority logPriority = NActors::NLog::PRI_DEBUG) {
+    void Start(bool waitInit = true, bool addBrokenDatacenter = false) {
         Server.StartServer(false);
-        Server.EnableLogs(logServices, logPriority);
         Server.AnnoyingClient->InitRoot();
         if (DataCenters.empty()) {
             THashMap<TString, NKikimr::NPersQueueTests::TPQTestClusterInfo> dataCenters;
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/test_server.h b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/test_server.h
index 0486f4bb64d..9e3c38b2a41 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/test_server.h
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/test_server.h
@@ -15,13 +15,20 @@ static constexpr int DEBUG_LOG_LEVEL = 7;
 
 class TTestServer {
 public:
-    TTestServer(bool start = true, TMaybe<TSimpleSharedPtr<TPortManager>> portManager = Nothing())
+    TTestServer(bool start = true, TMaybe<TSimpleSharedPtr<TPortManager>> portManager = Nothing(),
+                const TVector<NKikimrServices::EServiceKikimr>& logServices = TTestServer::LOGGED_SERVICES, NActors::NLog::EPriority logPriority = NActors::NLog::PRI_DEBUG)
         : PortManager(portManager.GetOrElse(MakeSimpleShared<TPortManager>()))
         , Port(PortManager->GetPort(2134))
         , GrpcPort(PortManager->GetPort(2135))
         , ServerSettings(NKikimr::NPersQueueTests::PQSettings(Port).SetGrpcPort(GrpcPort))
         , GrpcServerOptions(NGrpc::TServerOptions().SetHost("[::1]").SetPort(GrpcPort))
     {
+        auto loggerInitializer = [logServices, logPriority](NActors::TTestActorRuntime& runtime) {
+            for (auto s : logServices)
+                runtime.SetLogPriority(s, logPriority);
+        };
+        ServerSettings.SetLoggerInitializer(loggerInitializer);
+
         if (start) {
             StartServer();
         }
@@ -41,9 +48,9 @@ public:
 
     void StartServer(bool doClientInit = true, TMaybe<TString> databaseName = Nothing()) {
         PrepareNetDataFile();
+
         CleverServer = MakeHolder<NKikimr::Tests::TServer>(ServerSettings);
         CleverServer->EnableGRpc(GrpcServerOptions);
-        EnableLogs();
 
         Cerr << "TTestServer started on Port " << Port << " GrpcPort " << GrpcPort << Endl;
 
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/ut_utils.h b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/ut_utils.h
index dd79296998e..6de8d1c1a28 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/ut_utils.h
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/ut_utils.h
@@ -16,9 +16,11 @@ class TPersQueueYdbSdkTestSetup : public ::NPersQueue::SDKTestSetup {
 
     TAdaptiveLock Lock;
 public:
-    TPersQueueYdbSdkTestSetup(const TString& testCaseName, bool start = true)
-        : SDKTestSetup(testCaseName, start)
-    {}
+    TPersQueueYdbSdkTestSetup(const TString& testCaseName, bool start = true,
+                              const TVector<NKikimrServices::EServiceKikimr>& logServices = ::NPersQueue::TTestServer::LOGGED_SERVICES, NActors::NLog::EPriority logPriority = NActors::NLog::PRI_DEBUG)
+        : SDKTestSetup(testCaseName, start, logServices, logPriority)
+    {
+    }
 
     ~TPersQueueYdbSdkTestSetup() {
         if (PersQueueClient) {