@@ -49,18 +49,20 @@ TAutoPtr<TLogBackend> CreateLogBackendWithUnifiedAgent(
49
49
{
50
50
if (runConfig.AppConfig .HasLogConfig ()) {
51
51
const auto & logConfig = runConfig.AppConfig .GetLogConfig ();
52
+ const auto & dnConfig = runConfig.AppConfig .GetDynamicNameserviceConfig ();
52
53
TAutoPtr<TLogBackend> logBackend = TLogBackendBuildHelper::CreateLogBackendFromLogConfig (logConfig);
53
54
if (logConfig.HasUAClientConfig ()) {
54
55
const auto & uaClientConfig = logConfig.GetUAClientConfig ();
55
56
auto uaCounters = GetServiceCounters (counters, " utils" )->GetSubgroup (" subsystem" , " ua_client" );
56
57
auto logName = uaClientConfig.GetLogName ();
58
+ auto maxStaticNodeId = dnConfig.GetMaxStaticNodeId ();
57
59
TAutoPtr<TLogBackend> uaLogBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig (
58
60
uaClientConfig,
59
61
uaCounters,
60
62
logName,
61
- runConfig.TenantName == " " ? " static" : " slot" ,
63
+ runConfig.NodeId <= maxStaticNodeId ? " static" : " slot" ,
62
64
runConfig.TenantName ,
63
- runConfig. ClusterName
65
+ logConfig. HasClusterName () ? logConfig. GetClusterName () : " "
64
66
);
65
67
logBackend = logBackend ? NActors::CreateCompositeLogBackend ({logBackend, uaLogBackend}) : uaLogBackend;
66
68
}
@@ -93,18 +95,20 @@ TAutoPtr<TLogBackend> CreateMeteringLogBackendWithUnifiedAgent(
93
95
94
96
if (meteringConfig.GetUnifiedAgentEnable () && runConfig.AppConfig .HasLogConfig () && runConfig.AppConfig .GetLogConfig ().HasUAClientConfig ()) {
95
97
const auto & logConfig = runConfig.AppConfig .GetLogConfig ();
98
+ const auto & dnConfig = runConfig.AppConfig .GetDynamicNameserviceConfig ();
96
99
const auto & uaClientConfig = logConfig.GetUAClientConfig ();
97
100
auto uaCounters = GetServiceCounters (counters, " utils" )->GetSubgroup (" subsystem" , " ua_client" );
98
101
auto logName = meteringConfig.HasLogName ()
99
102
? meteringConfig.GetLogName ()
100
103
: uaClientConfig.GetLogName ();
104
+ auto maxStaticNodeId = dnConfig.GetMaxStaticNodeId ();
101
105
TAutoPtr<TLogBackend> uaLogBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig (
102
106
uaClientConfig,
103
107
uaCounters,
104
108
logName,
105
- runConfig.TenantName == " " ? " static" : " slot" ,
109
+ runConfig.NodeId <= maxStaticNodeId ? " static" : " slot" ,
106
110
runConfig.TenantName ,
107
- runConfig. ClusterName
111
+ logConfig. HasClusterName () ? logConfig. GetClusterName () : " "
108
112
);
109
113
logBackend = logBackend ? NActors::CreateCompositeLogBackend ({logBackend, uaLogBackend}) : uaLogBackend;
110
114
}
@@ -148,18 +152,20 @@ TAutoPtr<TLogBackend> CreateAuditLogUnifiedAgentBackend(
148
152
const auto & auditConfig = runConfig.AppConfig .GetAuditConfig ();
149
153
if (auditConfig.HasUnifiedAgentBackend () && runConfig.AppConfig .HasLogConfig () && runConfig.AppConfig .GetLogConfig ().HasUAClientConfig ()) {
150
154
const auto & logConfig = runConfig.AppConfig .GetLogConfig ();
155
+ const auto & dnConfig = runConfig.AppConfig .GetDynamicNameserviceConfig ();
151
156
const auto & uaClientConfig = logConfig.GetUAClientConfig ();
152
157
auto uaCounters = GetServiceCounters (counters, " utils" )->GetSubgroup (" subsystem" , " ua_client" );
153
158
auto logName = runConfig.AppConfig .GetAuditConfig ().GetUnifiedAgentBackend ().HasLogName ()
154
159
? runConfig.AppConfig .GetAuditConfig ().GetUnifiedAgentBackend ().GetLogName ()
155
160
: uaClientConfig.GetLogName ();
161
+ auto maxStaticNodeId = dnConfig.GetMaxStaticNodeId ();
156
162
logBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig (
157
163
uaClientConfig,
158
164
uaCounters,
159
165
logName,
160
- runConfig.TenantName == " " ? " static" : " slot" ,
166
+ runConfig.NodeId <= maxStaticNodeId ? " static" : " slot" ,
161
167
runConfig.TenantName ,
162
- runConfig. ClusterName
168
+ logConfig. HasClusterName () ? logConfig. GetClusterName () : " "
163
169
);
164
170
}
165
171
0 commit comments