Skip to content

Commit ed46ea3

Browse files
fixes
1 parent c3e45fa commit ed46ea3

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

ydb/core/mon/mon.cpp

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,11 +1026,11 @@ class THttpMonInitializator : public TActorBootstrapped<THttpMonInitializator> {
10261026
class THttpMonAuthorizedActorRequest : public TActorBootstrapped<THttpMonAuthorizedActorRequest> {
10271027
public:
10281028
NHttp::TEvHttpProxy::TEvHttpIncomingRequest::TPtr Event;
1029-
TMon::TRegisterHandlerFields& Fields;
1029+
TMon::TRegisterHandlerFields Fields;
10301030
TMon::TRequestAuthorizer Authorizer;
10311031
NHttp::TEvHttpProxy::TEvSubscribeForCancel::TPtr CancelSubscriber;
10321032

1033-
THttpMonAuthorizedActorRequest(NHttp::TEvHttpProxy::TEvHttpIncomingRequest::TPtr event, TMon::TRegisterHandlerFields& fields, TMon::TRequestAuthorizer authorizer)
1033+
THttpMonAuthorizedActorRequest(NHttp::TEvHttpProxy::TEvHttpIncomingRequest::TPtr event, const TMon::TRegisterHandlerFields& fields, TMon::TRequestAuthorizer authorizer)
10341034
: Event(std::move(event))
10351035
, Fields(fields)
10361036
, Authorizer(std::move(authorizer))
@@ -1163,8 +1163,6 @@ class THttpMonAuthorizedActorRequest : public TActorBootstrapped<THttpMonAuthori
11631163
Event->Get()->UserToken = result->UserToken->GetSerializedToken();
11641164
}
11651165
Send(new IEventHandle(Fields.Handler, SelfId(), Event->ReleaseBase().Release(), IEventHandle::FlagTrackDelivery, Event->Cookie));
1166-
1167-
PassAway();
11681166
}
11691167

11701168
void Cancelled() {
@@ -1180,7 +1178,7 @@ class THttpMonAuthorizedActorRequest : public TActorBootstrapped<THttpMonAuthori
11801178
}
11811179
NHttp::THttpIncomingRequestPtr request = Event->Get()->Request;
11821180
ReplyWith(request->CreateResponseServiceUnavailable(
1183-
TStringBuilder() << "Auth actor is not available"));
1181+
TStringBuilder() << "Actor is not available"));
11841182
PassAway();
11851183
}
11861184

@@ -1223,18 +1221,14 @@ class THttpMonAuthorizedActorRequest : public TActorBootstrapped<THttpMonAuthori
12231221
CancelSubscriber = std::move(ev);
12241222
}
12251223

1226-
void Handle(NHttp::TEvHttpProxy::TEvRequestCancelled::TPtr& /* ev */) {
1227-
Cancelled();
1228-
}
1229-
12301224
STATEFN(StateWork) {
12311225
switch (ev->GetTypeRewrite()) {
12321226
hFunc(TEvents::TEvUndelivered, HandleUndelivered);
12331227
hFunc(NKikimr::NGRpcService::TEvRequestAuthAndCheckResult, Handle);
12341228
hFunc(NHttp::TEvHttpProxy::TEvHttpOutgoingResponse, Handle);
12351229
hFunc(NHttp::TEvHttpProxy::TEvHttpOutgoingDataChunk, Handle);
12361230
hFunc(NHttp::TEvHttpProxy::TEvSubscribeForCancel, Handle);
1237-
hFunc(NHttp::TEvHttpProxy::TEvRequestCancelled, Handle);
1231+
cFunc(NHttp::TEvHttpProxy::EvRequestCancelled, Cancelled);
12381232
}
12391233
}
12401234
};

0 commit comments

Comments
 (0)