@@ -10,18 +10,20 @@ TAutoPtr<TLogBackend> CreateLogBackendWithUnifiedAgent(
10
10
{
11
11
if (runConfig.AppConfig .HasLogConfig ()) {
12
12
const auto & logConfig = runConfig.AppConfig .GetLogConfig ();
13
+ const auto & dnConfig = runConfig.AppConfig .GetDynamicNameserviceConfig ();
13
14
TAutoPtr<TLogBackend> logBackend = TLogBackendBuildHelper::CreateLogBackendFromLogConfig (logConfig);
14
15
if (logConfig.HasUAClientConfig ()) {
15
16
const auto & uaClientConfig = logConfig.GetUAClientConfig ();
16
17
auto uaCounters = GetServiceCounters (counters, " utils" )->GetSubgroup (" subsystem" , " ua_client" );
17
18
auto logName = uaClientConfig.GetLogName ();
19
+ auto maxStaticNodeId = dnConfig.GetMaxStaticNodeId ();
18
20
TAutoPtr<TLogBackend> uaLogBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig (
19
21
uaClientConfig,
20
22
uaCounters,
21
23
logName,
22
- runConfig.TenantName == " " ? " static" : " slot" ,
24
+ runConfig.NodeId <= maxStaticNodeId ? " static" : " slot" ,
23
25
runConfig.TenantName ,
24
- runConfig. ClusterName
26
+ logConfig. HasClusterName () ? logConfig. GetClusterName () : " "
25
27
);
26
28
logBackend = logBackend ? NActors::CreateCompositeLogBackend ({logBackend, uaLogBackend}) : uaLogBackend;
27
29
}
@@ -54,18 +56,20 @@ TAutoPtr<TLogBackend> CreateMeteringLogBackendWithUnifiedAgent(
54
56
55
57
if (meteringConfig.GetUnifiedAgentEnable () && runConfig.AppConfig .HasLogConfig () && runConfig.AppConfig .GetLogConfig ().HasUAClientConfig ()) {
56
58
const auto & logConfig = runConfig.AppConfig .GetLogConfig ();
59
+ const auto & dnConfig = runConfig.AppConfig .GetDynamicNameserviceConfig ();
57
60
const auto & uaClientConfig = logConfig.GetUAClientConfig ();
58
61
auto uaCounters = GetServiceCounters (counters, " utils" )->GetSubgroup (" subsystem" , " ua_client" );
59
62
auto logName = meteringConfig.HasLogName ()
60
63
? meteringConfig.GetLogName ()
61
64
: uaClientConfig.GetLogName ();
65
+ auto maxStaticNodeId = dnConfig.GetMaxStaticNodeId ();
62
66
TAutoPtr<TLogBackend> uaLogBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig (
63
67
uaClientConfig,
64
68
uaCounters,
65
69
logName,
66
- runConfig.TenantName == " " ? " static" : " slot" ,
70
+ runConfig.NodeId <= maxStaticNodeId ? " static" : " slot" ,
67
71
runConfig.TenantName ,
68
- runConfig. ClusterName
72
+ logConfig. HasClusterName () ? logConfig. GetClusterName () : " "
69
73
);
70
74
logBackend = logBackend ? NActors::CreateCompositeLogBackend ({logBackend, uaLogBackend}) : uaLogBackend;
71
75
}
@@ -109,18 +113,20 @@ TAutoPtr<TLogBackend> CreateAuditLogUnifiedAgentBackend(
109
113
const auto & auditConfig = runConfig.AppConfig .GetAuditConfig ();
110
114
if (auditConfig.HasUnifiedAgentBackend () && runConfig.AppConfig .HasLogConfig () && runConfig.AppConfig .GetLogConfig ().HasUAClientConfig ()) {
111
115
const auto & logConfig = runConfig.AppConfig .GetLogConfig ();
116
+ const auto & dnConfig = runConfig.AppConfig .GetDynamicNameserviceConfig ();
112
117
const auto & uaClientConfig = logConfig.GetUAClientConfig ();
113
118
auto uaCounters = GetServiceCounters (counters, " utils" )->GetSubgroup (" subsystem" , " ua_client" );
114
119
auto logName = runConfig.AppConfig .GetAuditConfig ().GetUnifiedAgentBackend ().HasLogName ()
115
120
? runConfig.AppConfig .GetAuditConfig ().GetUnifiedAgentBackend ().GetLogName ()
116
121
: uaClientConfig.GetLogName ();
122
+ auto maxStaticNodeId = dnConfig.GetMaxStaticNodeId ();
117
123
logBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig (
118
124
uaClientConfig,
119
125
uaCounters,
120
126
logName,
121
- runConfig.TenantName == " " ? " static" : " slot" ,
127
+ runConfig.NodeId <= maxStaticNodeId ? " static" : " slot" ,
122
128
runConfig.TenantName ,
123
- runConfig. ClusterName
129
+ logConfig. HasClusterName () ? logConfig. GetClusterName () : " "
124
130
);
125
131
}
126
132
0 commit comments