diff options
| author | ermolovd <[email protected]> | 2024-11-28 15:34:32 +0300 |
|---|---|---|
| committer | ermolovd <[email protected]> | 2024-11-28 15:45:53 +0300 |
| commit | 667d7a8073070f148e1adc7650b55e7a7ef33439 (patch) | |
| tree | e03282783ef7606d02176e91114582bbc8f5dd13 /yt/cpp/mapreduce/client/init.cpp | |
| parent | 4ba1f3d99a3e5499a3a0fa5c22a4628fe41f06f4 (diff) | |
YT-23645: mapreduce client can use yt/core log manager
commit_hash:7007a3c7f56a6f271073811160f00f03162aaaa6
Diffstat (limited to 'yt/cpp/mapreduce/client/init.cpp')
| -rw-r--r-- | yt/cpp/mapreduce/client/init.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/yt/cpp/mapreduce/client/init.cpp b/yt/cpp/mapreduce/client/init.cpp index 242bbcb2bb1..6121952f868 100644 --- a/yt/cpp/mapreduce/client/init.cpp +++ b/yt/cpp/mapreduce/client/init.cpp @@ -166,27 +166,32 @@ NLogging::ELogLevel ToCoreLogLevel(ILogger::ELevel level) Y_ABORT(); } -void CommonInitialize(int, const char**) +void CommonInitialize(TGuard<TMutex>& g) { auto logLevelStr = to_lower(TConfig::Get()->LogLevel); ILogger::ELevel logLevel; if (!TryFromString(logLevelStr, logLevel)) { Cerr << "Invalid log level: " << TConfig::Get()->LogLevel << Endl; + g.Release(); exit(1); } auto logPath = TConfig::Get()->LogPath; - ILoggerPtr logger; if (logPath.empty()) { - logger = CreateStdErrLogger(logLevel); + if (TConfig::Get()->LogUseCore) { + auto coreLoggingConfig = NLogging::TLogManagerConfig::CreateStderrLogger(ToCoreLogLevel(logLevel)); + NLogging::TLogManager::Get()->Configure(coreLoggingConfig); + SetUseCoreLog(); + } else { + auto logger = CreateStdErrLogger(logLevel); + SetLogger(logger); + } } else { - logger = CreateFileLogger(logLevel, logPath, /*append*/ true); - auto coreLoggingConfig = NLogging::TLogManagerConfig::CreateLogFile(logPath, ToCoreLogLevel(logLevel)); NLogging::TLogManager::Get()->Configure(coreLoggingConfig); + SetUseCoreLog(); } - SetLogger(logger); } void NonJobInitialize(const TInitializeOptions& options) @@ -281,8 +286,7 @@ void JoblessInitialize(const TInitializeOptions& options) { auto g = Guard(InitializeLock); - static const char* fakeArgv[] = {"unknown..."}; - NDetail::CommonInitialize(1, fakeArgv); + NDetail::CommonInitialize(g); NDetail::NonJobInitialize(options); NDetail::ElevateInitStatus(NDetail::EInitStatus::JoblessInitialization); } @@ -291,7 +295,7 @@ void Initialize(int argc, const char* argv[], const TInitializeOptions& options) { auto g = Guard(InitializeLock); - NDetail::CommonInitialize(argc, argv); + NDetail::CommonInitialize(g); NDetail::ElevateInitStatus(NDetail::EInitStatus::FullInitialization); |
