diff options
author | epbugaev <epbugaev@yandex-team.com> | 2023-09-20 15:13:44 +0300 |
---|---|---|
committer | epbugaev <epbugaev@yandex-team.com> | 2023-09-20 15:48:27 +0300 |
commit | 6e97fd1f0244b64f91606c3c9323c4e83f11e449 (patch) | |
tree | e86dc3dfac0e13a979630c34166b4af27335d307 | |
parent | fe3f3781595b6345ec4007cbc66b202dcc4a5c9b (diff) | |
download | ydb-6e97fd1f0244b64f91606c3c9323c4e83f11e449.tar.gz |
Use message bus for logs between core and task process
Change grpc to messageBus connection
-rw-r--r-- | ydb/library/yql/utils/log/log.cpp | 55 | ||||
-rw-r--r-- | ydb/library/yql/utils/log/log.h | 6 |
2 files changed, 0 insertions, 61 deletions
diff --git a/ydb/library/yql/utils/log/log.cpp b/ydb/library/yql/utils/log/log.cpp index bd763c301b..5ca6a89677 100644 --- a/ydb/library/yql/utils/log/log.cpp +++ b/ydb/library/yql/utils/log/log.cpp @@ -5,7 +5,6 @@ #include <library/cpp/logger/stream.h> #include <library/cpp/logger/system.h> #include <library/cpp/logger/composite.h> -#include <library/cpp/logger/backend_creator.h> #include <util/datetime/systime.h> #include <util/generic/strbuf.h> #include <util/stream/format.h> @@ -136,33 +135,6 @@ NYql::NProto::TLoggingConfig::TLogDestination CreateLogDestination(const TString return destination; } -class TYqlUaLogBackendCreatorInitContext : public ILogBackendCreator::IInitContext { -public: - TYqlUaLogBackendCreatorInitContext(const TString& loggerType, const TString& target = TString()) - : LoggerType(loggerType) - , Target(target) - {} - - virtual bool GetValue(TStringBuf name, TString& var) const override { - if (name == "LoggerType" && !LoggerType.empty()) { - var = LoggerType; - return true; - } else if (name == "Target" && !Target.empty()) { - var = Target; - return true; - } - return false; - } - - virtual TVector<THolder<IInitContext>> GetChildren(TStringBuf /*name*/) const override { - return TVector<THolder<IInitContext>>(); - } - -private: - TString LoggerType; - TString Target; -}; - } // namspace namespace NYql { @@ -381,33 +353,6 @@ void ReopenLog() { } } -void AddUnifiedAgentLogger(const NProto::TLoggingConfig& config) { - std::vector<THolder<TLogBackend>> backends; - - for (const auto& logDest : config.GetLogDest()) { - // Generate unified agent backend if specified - if (logDest.GetType() == NProto::TLoggingConfig::YQL_UA_LOGGER) { - TYqlUaLogBackendCreatorInitContext creatorContext(NProto::TLoggingConfig::ELogTo_Name(logDest.GetType()), - logDest.GetTarget()); - if (auto creator = ILogBackendCreator::Create(creatorContext)) { - backends.emplace_back(creator->CreateLogBackend()); - } - break; - } - } - - if (!backends.empty()) { - auto& logger = TLoggerOperator<TYqlLog>::Log(); - - THolder<TCompositeLogBackend> compositeBackend = MakeHolder<TCompositeLogBackend>(); - compositeBackend->AddLogBackend(logger.ReleaseBackend()); - for (auto& backend : backends) { - compositeBackend->AddLogBackend(std::move(backend)); - } - logger.ResetBackend(std::move(compositeBackend)); - } -} - } // namespace NLog } // namespace NYql diff --git a/ydb/library/yql/utils/log/log.h b/ydb/library/yql/utils/log/log.h index b88eecbfd8..aecf8e39dc 100644 --- a/ydb/library/yql/utils/log/log.h +++ b/ydb/library/yql/utils/log/log.h @@ -162,12 +162,6 @@ void InitLogger(const TString& log, bool startAsDaemon = false); void InitLogger(const NProto::TLoggingConfig& loggingConfig, bool startAsDaemon = false); /** - * @brief Add unified agent backends described in config to existing logger. - * Logger must be cleaned up before terminating program to close UA connections. -*/ -void AddUnifiedAgentLogger(const NProto::TLoggingConfig& config); - -/** * @brief Initialize logger with concrete backend. * * @param backend - logger backend |