diff options
author | Vlad Yaroslavlev <vladon@vladon.com> | 2022-02-10 16:46:23 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:23 +0300 |
commit | 706b83ed7de5a473436620367af31fc0ceecde07 (patch) | |
tree | 103305d30dec77e8f6367753367f59b3cd68f9f1 /library/cpp/messagebus/www | |
parent | 918e8a1574070d0ec733f0b76cfad8f8892ad2e5 (diff) | |
download | ydb-706b83ed7de5a473436620367af31fc0ceecde07.tar.gz |
Restoring authorship annotation for Vlad Yaroslavlev <vladon@vladon.com>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/messagebus/www')
-rw-r--r-- | library/cpp/messagebus/www/concat_strings.h | 6 | ||||
-rw-r--r-- | library/cpp/messagebus/www/html_output.h | 12 | ||||
-rw-r--r-- | library/cpp/messagebus/www/www.cpp | 56 | ||||
-rw-r--r-- | library/cpp/messagebus/www/www.h | 2 |
4 files changed, 38 insertions, 38 deletions
diff --git a/library/cpp/messagebus/www/concat_strings.h b/library/cpp/messagebus/www/concat_strings.h index 7b730564eb..86f6609c1d 100644 --- a/library/cpp/messagebus/www/concat_strings.h +++ b/library/cpp/messagebus/www/concat_strings.h @@ -1,9 +1,9 @@ #pragma once -#include <util/generic/string.h> +#include <util/generic/string.h> #include <util/stream/str.h> -// ATTN: not equivalent to TString::Join - cat concat anything "outputable" to stream, not only TString convertable types. +// ATTN: not equivalent to TString::Join - cat concat anything "outputable" to stream, not only TString convertable types. inline void DoConcatStrings(TStringStream&) { } @@ -15,7 +15,7 @@ inline void DoConcatStrings(TStringStream& ss, const T& t, const R&... r) { } template <class... R> -inline TString ConcatStrings(const R&... r) { +inline TString ConcatStrings(const R&... r) { TStringStream ss; DoConcatStrings(ss, r...); return ss.Str(); diff --git a/library/cpp/messagebus/www/html_output.h b/library/cpp/messagebus/www/html_output.h index 27e77adefa..551f0ba693 100644 --- a/library/cpp/messagebus/www/html_output.h +++ b/library/cpp/messagebus/www/html_output.h @@ -29,7 +29,7 @@ struct THtmlOutputStreamPushPop { }; struct TChars { - TString Text; + TString Text; bool NeedEscape; TChars(TStringBuf text) @@ -53,7 +53,7 @@ struct TChars { { } - TString Escape() { + TString Escape() { if (NeedEscape) { return EncodeHtmlPcdata(Text); } else { @@ -63,8 +63,8 @@ struct TChars { }; struct TAttr { - TString Name; - TString Value; + TString Name; + TString Value; TAttr(TStringBuf name, TStringBuf value) : Name(name) @@ -157,7 +157,7 @@ static inline void Small(TStringBuf text) { } static inline void HnWithSmall(unsigned n, TStringBuf title, TStringBuf small) { - TString tagName = ConcatStrings("h", n); + TString tagName = ConcatStrings("h", n); Open(tagName); HtmlOutputStream() << title; Sp(); @@ -268,7 +268,7 @@ static inline void Code(TStringBuf content) { } struct TTagGuard { - const TString TagName; + const TString TagName; TTagGuard(TStringBuf tagName, TStringBuf cssClass, TStringBuf id = "") : TagName(tagName) diff --git a/library/cpp/messagebus/www/www.cpp b/library/cpp/messagebus/www/www.cpp index 62ec241d85..a285a6367a 100644 --- a/library/cpp/messagebus/www/www.cpp +++ b/library/cpp/messagebus/www/www.cpp @@ -48,7 +48,7 @@ namespace { return TValuePtr(); } - TString FindNameByPtr(TValuePtr value) { + TString FindNameByPtr(TValuePtr value) { Y_VERIFY(!!value); for (unsigned i = 0; i < Entries.size(); ++i) { @@ -80,11 +80,11 @@ namespace { } for (unsigned i = 1;; ++i) { - TString prefix = p->GetNameInternal(); + TString prefix = p->GetNameInternal(); if (!prefix) { prefix = "unnamed"; } - TString name = ConcatStrings(prefix, "-", i); + TString name = ConcatStrings(prefix, "-", i); TValuePtr current = FindByName(name); @@ -108,8 +108,8 @@ namespace { struct TSessionValues: public TNamedValues<TSessionPtr> { typedef TNamedValues<TSessionPtr> TBase; - TVector<TString> GetNamesForQueue(TBusMessageQueue* queue) { - TVector<TString> r; + TVector<TString> GetNamesForQueue(TBusMessageQueue* queue) { + TVector<TString> r; for (unsigned i = 0; i < TBase::size(); ++i) { if (TBase::Entries[i].second->GetQueue() == queue) { r.push_back(TBase::Entries[i].first); @@ -211,14 +211,14 @@ struct TBusWww::TImpl { TGuard<TMutex> g(Mutex); { - TVector<TBusClientSessionPtr> clientSessions = module->GetInternal()->GetClientSessionsInternal(); + TVector<TBusClientSessionPtr> clientSessions = module->GetInternal()->GetClientSessionsInternal(); for (unsigned i = 0; i < clientSessions.size(); ++i) { RegisterClientSession(clientSessions[i]); } } { - TVector<TBusServerSessionPtr> serverSessions = module->GetInternal()->GetServerSessionsInternal(); + TVector<TBusServerSessionPtr> serverSessions = module->GetInternal()->GetServerSessionsInternal(); for (unsigned i = 0; i < serverSessions.size(); ++i) { RegisterServerSession(serverSessions[i]); } @@ -228,7 +228,7 @@ struct TBusWww::TImpl { Modules.Add(module->GetInternal()); } - TString FindQueueNameBySessionName(TStringBuf sessionName, bool client) { + TString FindQueueNameBySessionName(TStringBuf sessionName, bool client) { TIntrusivePtr<TBusClientSession> clientSession; TIntrusivePtr<TBusServerSession> serverSession; TBusSession* session; @@ -288,7 +288,7 @@ struct TBusWww::TImpl { } void BreadcrumbSession(TStringBuf sessionName, bool client) { - TString queueName = Outer->FindQueueNameBySessionName(sessionName, client); + TString queueName = Outer->FindQueueNameBySessionName(sessionName, client); TStringBuf whatSession = client ? "client session" : "server session"; TTagGuard ol("ol", "breadcrumb"); @@ -299,9 +299,9 @@ struct TBusWww::TImpl { } void ServeSessionsOfQueue(TBusMessageQueuePtr queue, bool includeQueue) { - TVector<TString> clientNames = Outer->ClientSessions.GetNamesForQueue(queue.Get()); - TVector<TString> serverNames = Outer->ServerSessions.GetNamesForQueue(queue.Get()); - TVector<TString> moduleNames = Outer->Modules.GetNamesForQueue(queue.Get()); + TVector<TString> clientNames = Outer->ClientSessions.GetNamesForQueue(queue.Get()); + TVector<TString> serverNames = Outer->ServerSessions.GetNamesForQueue(queue.Get()); + TVector<TString> moduleNames = Outer->Modules.GetNamesForQueue(queue.Get()); TTagGuard table("table", "table table-condensed table-bordered"); @@ -320,7 +320,7 @@ struct TBusWww::TImpl { } if (includeQueue) { - TTagGuard tr1("tr"); + TTagGuard tr1("tr"); Td("queue"); { @@ -329,7 +329,7 @@ struct TBusWww::TImpl { } { - TTagGuard tr2("td"); + TTagGuard tr2("td"); Pre(queue->GetStatusSingleLine()); } } @@ -385,7 +385,7 @@ struct TBusWww::TImpl { } } - void ServeQueue(const TString& name) { + void ServeQueue(const TString& name) { TBusMessageQueuePtr queue = Outer->Queues.FindByName(name); if (!queue) { @@ -518,7 +518,7 @@ struct TBusWww::TImpl { TSessionDumpStatus dumpStatus = session->GetStatusRecordInternal(); TBusMessageQueuePtr queue = session->GetQueue(); - TString queueName = Outer->Queues.FindNameByPtr(session->GetQueue()); + TString queueName = Outer->Queues.FindNameByPtr(session->GetQueue()); BreadcrumbSession(name, client); @@ -585,7 +585,7 @@ struct TBusWww::TImpl { NJsonWriter::TBuf buf(NJsonWriter::HEM_ESCAPE_HTML); buf.BeginList(); for (unsigned i = 0; i < h.Times.size(); ++i) { - TString label = TDurationHistogram::LabelBefore(i); + TString label = TDurationHistogram::LabelBefore(i); buf.BeginList(); buf.WriteString(label); buf.WriteLongLong(h.Times[i]); @@ -612,7 +612,7 @@ struct TBusWww::TImpl { H1("MessageBus queues"); for (unsigned i = 0; i < Outer->Queues.size(); ++i) { - TString queueName = Outer->Queues.Entries[i].first; + TString queueName = Outer->Queues.Entries[i].first; TBusMessageQueuePtr queue = Outer->Queues.Entries[i].second; HnWithSmall(3, queueName, "(queue)"); @@ -680,7 +680,7 @@ struct TBusWww::TImpl { status.ConnectionStatusSummary.ReaderStatus.Incremental.MessageCounter); } - void ServeSolomonJson(const TString& q, const TString& cs, const TString& ss) { + void ServeSolomonJson(const TString& q, const TString& cs, const TString& ss) { Y_UNUSED(q); Y_UNUSED(cs); Y_UNUSED(ss); @@ -692,15 +692,15 @@ struct TBusWww::TImpl { sj.OpenMetrics(); for (unsigned i = 0; i < Outer->Queues.size(); ++i) { - TString queueName = Outer->Queues.Entries[i].first; + TString queueName = Outer->Queues.Entries[i].first; TBusMessageQueuePtr queue = Outer->Queues.Entries[i].second; if (all || q == queueName) { WriteQueueSensors(sj, queueName, &*queue); } - TVector<TString> clientNames = Outer->ClientSessions.GetNamesForQueue(queue.Get()); - TVector<TString> serverNames = Outer->ServerSessions.GetNamesForQueue(queue.Get()); - TVector<TString> moduleNames = Outer->Modules.GetNamesForQueue(queue.Get()); + TVector<TString> clientNames = Outer->ClientSessions.GetNamesForQueue(queue.Get()); + TVector<TString> serverNames = Outer->ServerSessions.GetNamesForQueue(queue.Get()); + TVector<TString> moduleNames = Outer->Modules.GetNamesForQueue(queue.Get()); for (auto& sessionName : clientNames) { if (all || cs == sessionName) { auto session = Outer->ClientSessions.FindByName(sessionName); @@ -728,7 +728,7 @@ struct TBusWww::TImpl { } else { os << HTTP_OK_BIN; } - TBlob blob = Singleton<TWwwStaticLoader>()->ObjectBlobByKey(TString("/") + TString(path)); + TBlob blob = Singleton<TWwwStaticLoader>()->ObjectBlobByKey(TString("/") + TString(path)); os.Write(blob.Data(), blob.Size()); } @@ -766,9 +766,9 @@ struct TBusWww::TImpl { if (solomonJson) { Os << HTTP_OK_JSON; - TString qp = q != CgiParams.end() ? q->first : ""; - TString csp = cs != CgiParams.end() ? cs->first : ""; - TString ssp = ss != CgiParams.end() ? ss->first : ""; + TString qp = q != CgiParams.end() ? q->first : ""; + TString csp = cs != CgiParams.end() ? cs->first : ""; + TString ssp = ss != CgiParams.end() ? ss->first : ""; ServeSolomonJson(qp, csp, ssp); } else { Os << HTTP_OK_HTML; @@ -870,7 +870,7 @@ struct TBusWwwHttpServer::TImpl: public THttpServer::ICallBack { } }; - TString MakeSimpleResponse(unsigned code, TString text, TString content = "") { + TString MakeSimpleResponse(unsigned code, TString text, TString content = "") { if (!content) { TStringStream contentSs; contentSs << code << " " << text; diff --git a/library/cpp/messagebus/www/www.h b/library/cpp/messagebus/www/www.h index 6cd652b477..7180b5b692 100644 --- a/library/cpp/messagebus/www/www.h +++ b/library/cpp/messagebus/www/www.h @@ -4,7 +4,7 @@ #include <library/cpp/messagebus/oldmodule/module.h> #include <util/generic/ptr.h> -#include <util/generic/string.h> +#include <util/generic/string.h> #include <library/cpp/cgiparam/cgiparam.h> namespace NBus { |