@@ -10,18 +10,20 @@ TAutoPtr<TLogBackend> CreateLogBackendWithUnifiedAgent(
1010{
1111 if (runConfig.AppConfig .HasLogConfig ()) {
1212 const auto & logConfig = runConfig.AppConfig .GetLogConfig ();
13+ const auto & dnConfig = runConfig.AppConfig .GetDynamicNameserviceConfig ();
1314 TAutoPtr<TLogBackend> logBackend = TLogBackendBuildHelper::CreateLogBackendFromLogConfig (logConfig);
1415 if (logConfig.HasUAClientConfig ()) {
1516 const auto & uaClientConfig = logConfig.GetUAClientConfig ();
1617 auto uaCounters = GetServiceCounters (counters, " utils" )->GetSubgroup (" subsystem" , " ua_client" );
1718 auto logName = uaClientConfig.GetLogName ();
19+ auto maxStaticNodeId = dnConfig.GetMaxStaticNodeId ();
1820 TAutoPtr<TLogBackend> uaLogBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig (
1921 uaClientConfig,
2022 uaCounters,
2123 logName,
22- runConfig.TenantName == " " ? " static" : " slot" ,
24+ runConfig.NodeId <= maxStaticNodeId ? " static" : " slot" ,
2325 runConfig.TenantName ,
24- runConfig. ClusterName
26+ logConfig. HasClusterName () ? logConfig. GetClusterName () : " "
2527 );
2628 logBackend = logBackend ? NActors::CreateCompositeLogBackend ({logBackend, uaLogBackend}) : uaLogBackend;
2729 }
@@ -54,18 +56,20 @@ TAutoPtr<TLogBackend> CreateMeteringLogBackendWithUnifiedAgent(
5456
5557 if (meteringConfig.GetUnifiedAgentEnable () && runConfig.AppConfig .HasLogConfig () && runConfig.AppConfig .GetLogConfig ().HasUAClientConfig ()) {
5658 const auto & logConfig = runConfig.AppConfig .GetLogConfig ();
59+ const auto & dnConfig = runConfig.AppConfig .GetDynamicNameserviceConfig ();
5760 const auto & uaClientConfig = logConfig.GetUAClientConfig ();
5861 auto uaCounters = GetServiceCounters (counters, " utils" )->GetSubgroup (" subsystem" , " ua_client" );
5962 auto logName = meteringConfig.HasLogName ()
6063 ? meteringConfig.GetLogName ()
6164 : uaClientConfig.GetLogName ();
65+ auto maxStaticNodeId = dnConfig.GetMaxStaticNodeId ();
6266 TAutoPtr<TLogBackend> uaLogBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig (
6367 uaClientConfig,
6468 uaCounters,
6569 logName,
66- runConfig.TenantName == " " ? " static" : " slot" ,
70+ runConfig.NodeId <= maxStaticNodeId ? " static" : " slot" ,
6771 runConfig.TenantName ,
68- runConfig. ClusterName
72+ logConfig. HasClusterName () ? logConfig. GetClusterName () : " "
6973 );
7074 logBackend = logBackend ? NActors::CreateCompositeLogBackend ({logBackend, uaLogBackend}) : uaLogBackend;
7175 }
@@ -109,18 +113,20 @@ TAutoPtr<TLogBackend> CreateAuditLogUnifiedAgentBackend(
109113 const auto & auditConfig = runConfig.AppConfig .GetAuditConfig ();
110114 if (auditConfig.HasUnifiedAgentBackend () && runConfig.AppConfig .HasLogConfig () && runConfig.AppConfig .GetLogConfig ().HasUAClientConfig ()) {
111115 const auto & logConfig = runConfig.AppConfig .GetLogConfig ();
116+ const auto & dnConfig = runConfig.AppConfig .GetDynamicNameserviceConfig ();
112117 const auto & uaClientConfig = logConfig.GetUAClientConfig ();
113118 auto uaCounters = GetServiceCounters (counters, " utils" )->GetSubgroup (" subsystem" , " ua_client" );
114119 auto logName = runConfig.AppConfig .GetAuditConfig ().GetUnifiedAgentBackend ().HasLogName ()
115120 ? runConfig.AppConfig .GetAuditConfig ().GetUnifiedAgentBackend ().GetLogName ()
116121 : uaClientConfig.GetLogName ();
122+ auto maxStaticNodeId = dnConfig.GetMaxStaticNodeId ();
117123 logBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig (
118124 uaClientConfig,
119125 uaCounters,
120126 logName,
121- runConfig.TenantName == " " ? " static" : " slot" ,
127+ runConfig.NodeId <= maxStaticNodeId ? " static" : " slot" ,
122128 runConfig.TenantName ,
123- runConfig. ClusterName
129+ logConfig. HasClusterName () ? logConfig. GetClusterName () : " "
124130 );
125131 }
126132
0 commit comments