aboutsummaryrefslogtreecommitdiffstats
path: root/library/cpp/actors
diff options
context:
space:
mode:
authoryegorskii <yegorskii@yandex-team.ru>2022-02-10 16:49:10 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:49:10 +0300
commit7902ff9c26a2eacba73e7137a81aed2df9b3e9c1 (patch)
tree73bf9118a03a24dbbab4f6c1d0f0b508bc115bb4 /library/cpp/actors
parent1eb755fbca92172a6aec2f57371b2b3a19dfab43 (diff)
downloadydb-7902ff9c26a2eacba73e7137a81aed2df9b3e9c1.tar.gz
Restoring authorship annotation for <yegorskii@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/actors')
-rw-r--r--library/cpp/actors/core/log_settings.cpp12
-rw-r--r--library/cpp/actors/core/log_settings.h8
-rw-r--r--library/cpp/actors/core/log_ut.cpp112
-rw-r--r--library/cpp/actors/core/mon.h24
4 files changed, 78 insertions, 78 deletions
diff --git a/library/cpp/actors/core/log_settings.cpp b/library/cpp/actors/core/log_settings.cpp
index f52f2fc5d2..e49abf4717 100644
--- a/library/cpp/actors/core/log_settings.cpp
+++ b/library/cpp/actors/core/log_settings.cpp
@@ -6,11 +6,11 @@ namespace NActors {
namespace NLog {
TSettings::TSettings(const TActorId& loggerActorId, const EComponent loggerComponent,
EComponent minVal, EComponent maxVal, EComponentToStringFunc func,
- EPriority defPriority, EPriority defSamplingPriority,
- ui32 defSamplingRate, ui64 timeThresholdMs)
+ EPriority defPriority, EPriority defSamplingPriority,
+ ui32 defSamplingRate, ui64 timeThresholdMs)
: LoggerActorId(loggerActorId)
, LoggerComponent(loggerComponent)
- , TimeThresholdMs(timeThresholdMs)
+ , TimeThresholdMs(timeThresholdMs)
, AllowDrop(true)
, ThrottleDelay(TDuration::MilliSeconds(100))
, MinVal(0)
@@ -28,11 +28,11 @@ namespace NActors {
}
TSettings::TSettings(const TActorId& loggerActorId, const EComponent loggerComponent,
- EPriority defPriority, EPriority defSamplingPriority,
- ui32 defSamplingRate, ui64 timeThresholdMs)
+ EPriority defPriority, EPriority defSamplingPriority,
+ ui32 defSamplingRate, ui64 timeThresholdMs)
: LoggerActorId(loggerActorId)
, LoggerComponent(loggerComponent)
- , TimeThresholdMs(timeThresholdMs)
+ , TimeThresholdMs(timeThresholdMs)
, AllowDrop(true)
, ThrottleDelay(TDuration::MilliSeconds(100))
, MinVal(0)
diff --git a/library/cpp/actors/core/log_settings.h b/library/cpp/actors/core/log_settings.h
index 7fe4504edd..ebb689be09 100644
--- a/library/cpp/actors/core/log_settings.h
+++ b/library/cpp/actors/core/log_settings.h
@@ -100,12 +100,12 @@ namespace NActors {
// YOURTYPE_Name for you.
TSettings(const TActorId& loggerActorId, const EComponent loggerComponent,
EComponent minVal, EComponent maxVal, EComponentToStringFunc func,
- EPriority defPriority, EPriority defSamplingPriority = PRI_DEBUG,
- ui32 defSamplingRate = 0, ui64 timeThresholdMs = 1000);
+ EPriority defPriority, EPriority defSamplingPriority = PRI_DEBUG,
+ ui32 defSamplingRate = 0, ui64 timeThresholdMs = 1000);
TSettings(const TActorId& loggerActorId, const EComponent loggerComponent,
- EPriority defPriority, EPriority defSamplingPriority = PRI_DEBUG,
- ui32 defSamplingRate = 0, ui64 timeThresholdMs = 1000);
+ EPriority defPriority, EPriority defSamplingPriority = PRI_DEBUG,
+ ui32 defSamplingRate = 0, ui64 timeThresholdMs = 1000);
void Append(EComponent minVal, EComponent maxVal, EComponentToStringFunc func);
diff --git a/library/cpp/actors/core/log_ut.cpp b/library/cpp/actors/core/log_ut.cpp
index 09b5f88ea2..d742357e3f 100644
--- a/library/cpp/actors/core/log_ut.cpp
+++ b/library/cpp/actors/core/log_ut.cpp
@@ -22,19 +22,19 @@ namespace {
return s;
}
- TIntrusivePtr<TSettings> DroppingSettings(ui64 timeThresholdMs) {
- auto loggerId = TActorId{0, "Logger"};
- auto s = MakeIntrusive<TSettings>(
- loggerId,
- 0,
- EPriority::PRI_TRACE,
- EPriority::PRI_DEBUG,
- (ui32)0,
- timeThresholdMs);
- s->Append(0, 1, ServiceToString);
- return s;
- }
-
+ TIntrusivePtr<TSettings> DroppingSettings(ui64 timeThresholdMs) {
+ auto loggerId = TActorId{0, "Logger"};
+ auto s = MakeIntrusive<TSettings>(
+ loggerId,
+ 0,
+ EPriority::PRI_TRACE,
+ EPriority::PRI_DEBUG,
+ (ui32)0,
+ timeThresholdMs);
+ s->Append(0, 1, ServiceToString);
+ return s;
+ }
+
class TMockBackend: public TLogBackend {
public:
using TWriteImpl = std::function<void(const TLogRecord&)>;
@@ -68,30 +68,30 @@ namespace {
};
struct TFixture {
- TFixture(
- TIntrusivePtr<TSettings> settings,
- TMockBackend::TWriteImpl writeImpl = ThrowAlways)
- {
+ TFixture(
+ TIntrusivePtr<TSettings> settings,
+ TMockBackend::TWriteImpl writeImpl = ThrowAlways)
+ {
Runtime.Initialize();
LogBackend.reset(new TMockBackend{writeImpl});
- LoggerActor = Runtime.Register(new TLoggerActor{settings, LogBackend, Counters});
+ LoggerActor = Runtime.Register(new TLoggerActor{settings, LogBackend, Counters});
Runtime.SetScheduledEventFilter([] (auto&&, auto&&, auto&&, auto) {
return false;
});
}
- TFixture(TMockBackend::TWriteImpl writeImpl = ThrowAlways)
- : TFixture(DefaultSettings(), writeImpl)
- {}
-
+ TFixture(TMockBackend::TWriteImpl writeImpl = ThrowAlways)
+ : TFixture(DefaultSettings(), writeImpl)
+ {}
+
void WriteLog() {
Runtime.Send(new IEventHandle{LoggerActor, {}, new TEvLog(TInstant::Zero(), TLevel{EPrio::Emerg}, 0, "foo")});
}
- void WriteLog(TInstant ts) {
- Runtime.Send(new IEventHandle{LoggerActor, {}, new TEvLog(ts, TLevel{EPrio::Emerg}, 0, "foo")});
- }
-
+ void WriteLog(TInstant ts) {
+ Runtime.Send(new IEventHandle{LoggerActor, {}, new TEvLog(ts, TLevel{EPrio::Emerg}, 0, "foo")});
+ }
+
void Wakeup() {
Runtime.Send(new IEventHandle{LoggerActor, {}, new TEvents::TEvWakeup});
}
@@ -152,34 +152,34 @@ Y_UNIT_TEST_SUITE(TLoggerActorTest) {
UNIT_ASSERT_VALUES_EQUAL(messages.size(), COUNT);
}
-
- Y_UNIT_TEST(ShouldObeyTimeThresholdMsWhenOverloaded) {
- TFixture test{DroppingSettings(5000)};
-
- TVector<TString> messages;
- auto acceptWrites = [&] (const TLogRecord& r) {
- messages.emplace_back(r.Data, r.Len);
- };
-
- test.LogBackend->SetWriteImpl(acceptWrites);
- test.Wakeup();
-
- const auto COUNT = 11;
- for (auto i = 0; i < COUNT; ++i) {
- test.WriteLog();
- }
-
- UNIT_ASSERT_VALUES_EQUAL(messages.size(), COUNT);
-
- test.Runtime.AdvanceCurrentTime(TDuration::Seconds(20));
- auto now = test.Runtime.GetCurrentTime();
-
- test.WriteLog(now - TDuration::Seconds(5));
-
- UNIT_ASSERT_VALUES_EQUAL(messages.size(), COUNT + 1);
-
- test.WriteLog(now - TDuration::Seconds(6));
-
- UNIT_ASSERT_VALUES_EQUAL(messages.size(), COUNT + 1);
- }
+
+ Y_UNIT_TEST(ShouldObeyTimeThresholdMsWhenOverloaded) {
+ TFixture test{DroppingSettings(5000)};
+
+ TVector<TString> messages;
+ auto acceptWrites = [&] (const TLogRecord& r) {
+ messages.emplace_back(r.Data, r.Len);
+ };
+
+ test.LogBackend->SetWriteImpl(acceptWrites);
+ test.Wakeup();
+
+ const auto COUNT = 11;
+ for (auto i = 0; i < COUNT; ++i) {
+ test.WriteLog();
+ }
+
+ UNIT_ASSERT_VALUES_EQUAL(messages.size(), COUNT);
+
+ test.Runtime.AdvanceCurrentTime(TDuration::Seconds(20));
+ auto now = test.Runtime.GetCurrentTime();
+
+ test.WriteLog(now - TDuration::Seconds(5));
+
+ UNIT_ASSERT_VALUES_EQUAL(messages.size(), COUNT + 1);
+
+ test.WriteLog(now - TDuration::Seconds(6));
+
+ UNIT_ASSERT_VALUES_EQUAL(messages.size(), COUNT + 1);
+ }
}
diff --git a/library/cpp/actors/core/mon.h b/library/cpp/actors/core/mon.h
index c450f2338e..3854356fa8 100644
--- a/library/cpp/actors/core/mon.h
+++ b/library/cpp/actors/core/mon.h
@@ -88,14 +88,14 @@ namespace NActors {
{
}
- TEvRemoteHttpInfo(const TString& query, HTTP_METHOD method)
- : Query(query)
- , Method(method)
- {
- }
-
+ TEvRemoteHttpInfo(const TString& query, HTTP_METHOD method)
+ : Query(query)
+ , Method(method)
+ {
+ }
+
TString Query;
- HTTP_METHOD Method;
+ HTTP_METHOD Method;
TString PathInfo() const {
const size_t pos = Query.find('?');
@@ -126,11 +126,11 @@ namespace NActors {
static IEventBase* Load(TEventSerializedData* bufs) {
return new TEvRemoteHttpInfo(bufs->GetString());
}
-
- HTTP_METHOD GetMethod() const
- {
- return Method;
- }
+
+ HTTP_METHOD GetMethod() const
+ {
+ return Method;
+ }
};
struct TEvRemoteHttpInfoRes: public NActors::TEventBase<TEvRemoteHttpInfoRes, RemoteHttpInfoRes> {