diff options
author | Vlad Yaroslavlev <vladon@vladon.com> | 2022-02-10 16:46:25 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:25 +0300 |
commit | 344ea37b4a345701ab0e67de2266a1c1bd7baf2d (patch) | |
tree | 1a2c5ffcf89eb53ecd79dbc9bc0a195c27404d0c /library/cpp/monlib | |
parent | 706b83ed7de5a473436620367af31fc0ceecde07 (diff) | |
download | ydb-344ea37b4a345701ab0e67de2266a1c1bd7baf2d.tar.gz |
Restoring authorship annotation for Vlad Yaroslavlev <vladon@vladon.com>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/monlib')
-rw-r--r-- | library/cpp/monlib/counters/counters_ut.cpp | 2 | ||||
-rw-r--r-- | library/cpp/monlib/dynamic_counters/counters.h | 10 | ||||
-rw-r--r-- | library/cpp/monlib/dynamic_counters/golovan_page.cpp | 2 | ||||
-rw-r--r-- | library/cpp/monlib/dynamic_counters/page.cpp | 2 | ||||
-rw-r--r-- | library/cpp/monlib/encode/buffered/string_pool_ut.cpp | 12 | ||||
-rw-r--r-- | library/cpp/monlib/messagebus/mon_service_messagebus.cpp | 2 | ||||
-rw-r--r-- | library/cpp/monlib/metrics/labels_ut.cpp | 4 | ||||
-rw-r--r-- | library/cpp/monlib/service/mon_service_http_request.cpp | 2 | ||||
-rw-r--r-- | library/cpp/monlib/service/mon_service_http_request.h | 2 | ||||
-rw-r--r-- | library/cpp/monlib/service/monservice.cpp | 8 | ||||
-rw-r--r-- | library/cpp/monlib/service/pages/index_mon_page.cpp | 8 | ||||
-rw-r--r-- | library/cpp/monlib/service/pages/mon_page.cpp | 2 | ||||
-rw-r--r-- | library/cpp/monlib/service/pages/mon_page.h | 2 | ||||
-rw-r--r-- | library/cpp/monlib/service/pages/version_mon_page.cpp | 2 | ||||
-rw-r--r-- | library/cpp/monlib/service/pages/ya.make | 4 | ||||
-rw-r--r-- | library/cpp/monlib/service/service.cpp | 4 | ||||
-rw-r--r-- | library/cpp/monlib/service/service.h | 4 |
17 files changed, 36 insertions, 36 deletions
diff --git a/library/cpp/monlib/counters/counters_ut.cpp b/library/cpp/monlib/counters/counters_ut.cpp index 7c029e2e09..2845efb97b 100644 --- a/library/cpp/monlib/counters/counters_ut.cpp +++ b/library/cpp/monlib/counters/counters_ut.cpp @@ -42,7 +42,7 @@ Y_UNIT_TEST_SUITE(TDeprecatedCountersTest) { } // no duplication in group names - TSet<ui32> uniqueIds(ids->begin(), ids->end()); + TSet<ui32> uniqueIds(ids->begin(), ids->end()); UNIT_ASSERT_EQUAL(ids->size(), uniqueIds.size()); UNIT_ASSERT_EQUAL(ids->size(), GROUPS_COUNT); } diff --git a/library/cpp/monlib/dynamic_counters/counters.h b/library/cpp/monlib/dynamic_counters/counters.h index 52692f8149..dc178cfbe0 100644 --- a/library/cpp/monlib/dynamic_counters/counters.h +++ b/library/cpp/monlib/dynamic_counters/counters.h @@ -201,11 +201,11 @@ namespace NMonitoring { typedef TIntrusivePtr<TCountableBase> TCountablePtr; struct TChildId { - TString LabelName; - TString LabelValue; + TString LabelName; + TString LabelValue; TChildId() { } - TChildId(const TString& labelName, const TString& labelValue) + TChildId(const TString& labelName, const TString& labelValue) : LabelName(labelName) , LabelValue(labelValue) { @@ -329,8 +329,8 @@ namespace NMonitoring { void RemoveCounter(const TString &value); void RemoveNamedCounter(const TString& name, const TString &value); - TIntrusivePtr<TDynamicCounters> GetSubgroup(const TString& name, const TString& value); - TIntrusivePtr<TDynamicCounters> FindSubgroup(const TString& name, const TString& value) const; + TIntrusivePtr<TDynamicCounters> GetSubgroup(const TString& name, const TString& value); + TIntrusivePtr<TDynamicCounters> FindSubgroup(const TString& name, const TString& value) const; void RemoveSubgroup(const TString& name, const TString& value); void ReplaceSubgroup(const TString& name, const TString& value, TIntrusivePtr<TDynamicCounters> subgroup); diff --git a/library/cpp/monlib/dynamic_counters/golovan_page.cpp b/library/cpp/monlib/dynamic_counters/golovan_page.cpp index cda0fdfcf2..49cf2d39bb 100644 --- a/library/cpp/monlib/dynamic_counters/golovan_page.cpp +++ b/library/cpp/monlib/dynamic_counters/golovan_page.cpp @@ -61,7 +61,7 @@ public: private: IOutputStream& out; bool FirstCounter; - TString prefix; + TString prefix; }; TGolovanCountersPage::TGolovanCountersPage(const TString& path, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, diff --git a/library/cpp/monlib/dynamic_counters/page.cpp b/library/cpp/monlib/dynamic_counters/page.cpp index 649a232ca8..5124a47bb3 100644 --- a/library/cpp/monlib/dynamic_counters/page.cpp +++ b/library/cpp/monlib/dynamic_counters/page.cpp @@ -56,7 +56,7 @@ void TDynamicCountersPage::Output(NMonitoring::IMonHttpRequest& request) { for (const auto& escaped : parts) { const auto part = CGIUnescapeRet(escaped); - TVector<TString> labels; + TVector<TString> labels; StringSplitter(part).Split('=').SkipEmpty().Collect(&labels); if (labels.size() != 2U) diff --git a/library/cpp/monlib/encode/buffered/string_pool_ut.cpp b/library/cpp/monlib/encode/buffered/string_pool_ut.cpp index 8dc61d0113..9fc3421d0b 100644 --- a/library/cpp/monlib/encode/buffered/string_pool_ut.cpp +++ b/library/cpp/monlib/encode/buffered/string_pool_ut.cpp @@ -63,22 +63,22 @@ Y_UNIT_TEST_SUITE(TStringPoolTest) { strPool.Build(); - TVector<TString> strings; - TVector<ui32> indexes; - TVector<ui32> frequences; + TVector<TString> strings; + TVector<ui32> indexes; + TVector<ui32> frequences; strPool.ForEach([&](TStringBuf str, ui32 index, ui32 freq) { strings.emplace_back(str); indexes.push_back(index); frequences.push_back(freq); }); - TVector<TString> expectedStrings = {"three", "two", "one"}; + TVector<TString> expectedStrings = {"three", "two", "one"}; UNIT_ASSERT_EQUAL(strings, expectedStrings); - TVector<ui32> expectedIndexes = {0, 1, 2}; + TVector<ui32> expectedIndexes = {0, 1, 2}; UNIT_ASSERT_EQUAL(indexes, expectedIndexes); - TVector<ui32> expectedFrequences = {3, 2, 1}; + TVector<ui32> expectedFrequences = {3, 2, 1}; UNIT_ASSERT_EQUAL(frequences, expectedFrequences); } } diff --git a/library/cpp/monlib/messagebus/mon_service_messagebus.cpp b/library/cpp/monlib/messagebus/mon_service_messagebus.cpp index 8fe79b9b3a..4dd144ebe8 100644 --- a/library/cpp/monlib/messagebus/mon_service_messagebus.cpp +++ b/library/cpp/monlib/messagebus/mon_service_messagebus.cpp @@ -2,7 +2,7 @@ using namespace NMonitoring; -TMonServiceMessageBus::TMonServiceMessageBus(ui16 port, const TString& title) +TMonServiceMessageBus::TMonServiceMessageBus(ui16 port, const TString& title) : TMonService2(port, title) { } diff --git a/library/cpp/monlib/metrics/labels_ut.cpp b/library/cpp/monlib/metrics/labels_ut.cpp index 614ad8ffaf..f0e4f532ab 100644 --- a/library/cpp/monlib/metrics/labels_ut.cpp +++ b/library/cpp/monlib/metrics/labels_ut.cpp @@ -124,12 +124,12 @@ Y_UNIT_TEST_SUITE(TLabelsTest) { UNIT_ASSERT_EQUAL(labels[0], TLabel("name1", "value1")); UNIT_ASSERT_EQUAL(labels[1], TLabel("name2", "value2")); - TVector<TLabel> labelsCopy; + TVector<TLabel> labelsCopy; for (auto&& label : labels) { labelsCopy.emplace_back(label.Name(), label.Value()); } - UNIT_ASSERT_EQUAL(labelsCopy, TVector<TLabel>({ + UNIT_ASSERT_EQUAL(labelsCopy, TVector<TLabel>({ {"name1", "value1"}, {"name2", "value2"}, })); diff --git a/library/cpp/monlib/service/mon_service_http_request.cpp b/library/cpp/monlib/service/mon_service_http_request.cpp index 8abe33f0fb..5d805631d9 100644 --- a/library/cpp/monlib/service/mon_service_http_request.cpp +++ b/library/cpp/monlib/service/mon_service_http_request.cpp @@ -9,7 +9,7 @@ IMonHttpRequest::~IMonHttpRequest() { TMonService2HttpRequest::~TMonService2HttpRequest() { } -TString TMonService2HttpRequest::GetServiceTitle() const { +TString TMonService2HttpRequest::GetServiceTitle() const { return MonService->GetTitle(); } diff --git a/library/cpp/monlib/service/mon_service_http_request.h b/library/cpp/monlib/service/mon_service_http_request.h index 14974f1a20..b4f2f8f0c5 100644 --- a/library/cpp/monlib/service/mon_service_http_request.h +++ b/library/cpp/monlib/service/mon_service_http_request.h @@ -44,7 +44,7 @@ namespace NMonitoring { TMonService2HttpRequest( IOutputStream* out, const IHttpRequest* httpRequest, TMonService2* monService, IMonPage* monPage, - const TString& pathInfo, + const TString& pathInfo, TMonService2HttpRequest* parent) : Out(out) , HttpRequest(httpRequest) diff --git a/library/cpp/monlib/service/monservice.cpp b/library/cpp/monlib/service/monservice.cpp index fdb7f77c1a..d1b9cda1d2 100644 --- a/library/cpp/monlib/service/monservice.cpp +++ b/library/cpp/monlib/service/monservice.cpp @@ -78,7 +78,7 @@ void TMonService2::OutputIndexBody(IOutputStream& out) { } void TMonService2::ServeRequest(IOutputStream& out, const NMonitoring::IHttpRequest& request) { - TString path = request.GetPath(); + TString path = request.GetPath(); Y_VERIFY(path.StartsWith('/')); if (AuthProvider_) { @@ -112,15 +112,15 @@ void TMonService2::Register(TMonPagePtr page) { IndexMonPage->Register(std::move(page)); } -TIndexMonPage* TMonService2::RegisterIndexPage(const TString& path, const TString& title) { +TIndexMonPage* TMonService2::RegisterIndexPage(const TString& path, const TString& title) { return IndexMonPage->RegisterIndexPage(path, title); } -IMonPage* TMonService2::FindPage(const TString& relativePath) { +IMonPage* TMonService2::FindPage(const TString& relativePath) { return IndexMonPage->FindPage(relativePath); } -TIndexMonPage* TMonService2::FindIndexPage(const TString& relativePath) { +TIndexMonPage* TMonService2::FindIndexPage(const TString& relativePath) { return IndexMonPage->FindIndexPage(relativePath); } diff --git a/library/cpp/monlib/service/pages/index_mon_page.cpp b/library/cpp/monlib/service/pages/index_mon_page.cpp index 87cb7e7f99..83ff8b529a 100644 --- a/library/cpp/monlib/service/pages/index_mon_page.cpp +++ b/library/cpp/monlib/service/pages/index_mon_page.cpp @@ -36,7 +36,7 @@ void TIndexMonPage::Output(IMonHttpRequest& request) { break; } size_t slash = pathTmp.find_last_of('/'); - Y_VERIFY(slash != TString::npos); + Y_VERIFY(slash != TString::npos); pathTmp = pathTmp.substr(0, slash); if (!pathTmp) { break; @@ -56,7 +56,7 @@ void TIndexMonPage::OutputIndex(IOutputStream& out, bool pathEndsWithSlash) { for (auto& Page : Pages) { IMonPage* page = Page.Get(); if (page->IsInIndex()) { - TString pathToDir = ""; + TString pathToDir = ""; if (!pathEndsWithSlash) { pathToDir = this->GetPath() + "/"; } @@ -94,7 +94,7 @@ TIndexMonPage* TIndexMonPage::RegisterIndexPage(const TString& path, const TStri return VerifyDynamicCast<TIndexMonPage*>(page); } -IMonPage* TIndexMonPage::FindPage(const TString& relativePath) { +IMonPage* TIndexMonPage::FindPage(const TString& relativePath) { TGuard<TMutex> g(Mtx); Y_VERIFY(!relativePath.StartsWith('/')); @@ -106,7 +106,7 @@ IMonPage* TIndexMonPage::FindPage(const TString& relativePath) { } } -TIndexMonPage* TIndexMonPage::FindIndexPage(const TString& relativePath) { +TIndexMonPage* TIndexMonPage::FindIndexPage(const TString& relativePath) { return VerifyDynamicCast<TIndexMonPage*>(FindPage(relativePath)); } diff --git a/library/cpp/monlib/service/pages/mon_page.cpp b/library/cpp/monlib/service/pages/mon_page.cpp index 7bf9cce18e..72033b1699 100644 --- a/library/cpp/monlib/service/pages/mon_page.cpp +++ b/library/cpp/monlib/service/pages/mon_page.cpp @@ -2,7 +2,7 @@ using namespace NMonitoring; -IMonPage::IMonPage(const TString& path, const TString& title) +IMonPage::IMonPage(const TString& path, const TString& title) : Path(path) , Title(title) { diff --git a/library/cpp/monlib/service/pages/mon_page.h b/library/cpp/monlib/service/pages/mon_page.h index 1a51dbfa60..e396612bb0 100644 --- a/library/cpp/monlib/service/pages/mon_page.h +++ b/library/cpp/monlib/service/pages/mon_page.h @@ -3,7 +3,7 @@ #include <library/cpp/monlib/service/service.h> #include <library/cpp/monlib/service/mon_service_http_request.h> -#include <util/generic/string.h> +#include <util/generic/string.h> #include <util/generic/ptr.h> namespace NMonitoring { diff --git a/library/cpp/monlib/service/pages/version_mon_page.cpp b/library/cpp/monlib/service/pages/version_mon_page.cpp index 01ec97d48f..41e29417da 100644 --- a/library/cpp/monlib/service/pages/version_mon_page.cpp +++ b/library/cpp/monlib/service/pages/version_mon_page.cpp @@ -9,7 +9,7 @@ using namespace NMonitoring; void TVersionMonPage::OutputText(IOutputStream& out, NMonitoring::IMonHttpRequest&) { const char* version = GetProgramSvnVersion(); out << version; - if (!TString(version).EndsWith("\n")) + if (!TString(version).EndsWith("\n")) out << "\n"; out << GetBuildInfo() << "\n\n"; out << "linked with malloc: " << NMalloc::MallocInfo().Name << "\n"; diff --git a/library/cpp/monlib/service/pages/ya.make b/library/cpp/monlib/service/pages/ya.make index 3631168ece..48d44a0838 100644 --- a/library/cpp/monlib/service/pages/ya.make +++ b/library/cpp/monlib/service/pages/ya.make @@ -2,8 +2,8 @@ LIBRARY() OWNER(g:solomon) -NO_WSHADOW() - +NO_WSHADOW() + SRCS( diag_mon_page.cpp html_mon_page.cpp diff --git a/library/cpp/monlib/service/service.cpp b/library/cpp/monlib/service/service.cpp index b4b522939c..929efbf816 100644 --- a/library/cpp/monlib/service/service.cpp +++ b/library/cpp/monlib/service/service.cpp @@ -29,7 +29,7 @@ namespace NMonitoring { out << "HTTP/1.1 400 Invalid url\r\nConnection: Close\r\n\r\n"; return; } - TString path = GetPath(); + TString path = GetPath(); if (!path.StartsWith('/')) { out << "HTTP/1.1 400 Bad request\r\nConnection: Close\r\n\r\n"; return; @@ -133,7 +133,7 @@ namespace NMonitoring { const TCoHttpServer& Parent; }; - TCoHttpServer::TCoHttpServer(TContExecutor& executor, const TString& bindAddr, TIpPort port, THandler handler) + TCoHttpServer::TCoHttpServer(TContExecutor& executor, const TString& bindAddr, TIpPort port, THandler handler) : Executor(executor) , Listener(this, &executor) , Handler(std::move(handler)) diff --git a/library/cpp/monlib/service/service.h b/library/cpp/monlib/service/service.h index 9272266e50..2f66dddaf8 100644 --- a/library/cpp/monlib/service/service.h +++ b/library/cpp/monlib/service/service.h @@ -33,7 +33,7 @@ namespace NMonitoring { class TCoHttpServer: private TContListener::ICallBack { public: // initialize and schedule coroutines for execution - TCoHttpServer(TContExecutor& executor, const TString& bindAddr, TIpPort port, THandler handler); + TCoHttpServer(TContExecutor& executor, const TString& bindAddr, TIpPort port, THandler handler); void Start(); void Stop(); @@ -54,7 +54,7 @@ namespace NMonitoring { TContExecutor& Executor; TContListener Listener; THandler Handler; - TString BindAddr; + TString BindAddr; TIpPort Port; }; |