Restoring authorship annotation for <gleb-kov@yandex-team.ru>. Commit 2 of 2.

3 files changed, 25 insertions, 25 deletions

diff --git a/library/cpp/actors/interconnect/interconnect_handshake.cpp b/library/cpp/actors/interconnect/interconnect_handshake.cpp
index e76f3998d6..9ede998d8e 100644
--- a/library/cpp/actors/interconnect/interconnect_handshake.cpp
+++ b/library/cpp/actors/interconnect/interconnect_handshake.cpp
@@ -93,8 +93,8 @@ namespace NActors {
         TMaybe<THolder<TProgramInfo>> ProgramInfo; // filled in in case of successful handshake; even if null
         TSessionParams Params;
         bool ResolveTimedOut = false;
-        THashMap<ui32, TInstant> LastLogNotice; 
-        const TDuration MuteDuration = TDuration::Seconds(15); 
+        THashMap<ui32, TInstant> LastLogNotice;
+        const TDuration MuteDuration = TDuration::Seconds(15);
         TInstant Deadline;
 
     public:
@@ -791,12 +791,12 @@ namespace NActors {
 
             if (network) {
                 TInstant now = Now();
-                TInstant prevLog = LastLogNotice[PeerNodeId]; 
-                NActors::NLog::EPriority logPriority = NActors::NLog::PRI_DEBUG; 
-                if (now - prevLog > MuteDuration) { 
-                    logPriority = NActors::NLog::PRI_NOTICE; 
-                    LastLogNotice[PeerNodeId] = now; 
-                } 
+                TInstant prevLog = LastLogNotice[PeerNodeId];
+                NActors::NLog::EPriority logPriority = NActors::NLog::PRI_DEBUG;
+                if (now - prevLog > MuteDuration) {
+                    logPriority = NActors::NLog::PRI_NOTICE;
+                    LastLogNotice[PeerNodeId] = now;
+                }
                 LOG_LOG_NET_X(logPriority, PeerNodeId, "network-related error occured on handshake: %s", msg.data());
             } else {
                 // calculate log severity based on failure type; permanent failures lead to error log messages
@@ -883,12 +883,12 @@ namespace NActors {
                     break;
             }
 
-            auto it = LastLogNotice.find(PeerNodeId); 
-            NActors::NLog::EPriority logPriority = NActors::NLog::PRI_DEBUG; 
-            if (it != LastLogNotice.end()) { 
-                LastLogNotice.erase(it); 
-                logPriority = NActors::NLog::PRI_NOTICE; 
-            } 
+            auto it = LastLogNotice.find(PeerNodeId);
+            NActors::NLog::EPriority logPriority = NActors::NLog::PRI_DEBUG;
+            if (it != LastLogNotice.end()) {
+                LastLogNotice.erase(it);
+                logPriority = NActors::NLog::PRI_NOTICE;
+            }
             LOG_LOG_IC_X(NActorsServices::INTERCONNECT, "ICH05", logPriority, "connected to peer");
         }
 
diff --git a/library/cpp/actors/interconnect/interconnect_tcp_proxy.cpp b/library/cpp/actors/interconnect/interconnect_tcp_proxy.cpp
index 647d7e0d44..7e2d8ccb94 100644
--- a/library/cpp/actors/interconnect/interconnect_tcp_proxy.cpp
+++ b/library/cpp/actors/interconnect/interconnect_tcp_proxy.cpp
@@ -451,12 +451,12 @@ namespace NActors {
                 break;
 
             case TEvHandshakeFail::HANDSHAKE_FAIL_PERMANENT:
-                TString timeExplanation = " LastSessionDieTime# " + LastSessionDieTime.ToString(); 
+                TString timeExplanation = " LastSessionDieTime# " + LastSessionDieTime.ToString();
                 if (Session) {
                     InvokeOtherActor(*Session, &TInterconnectSessionTCP::Terminate,
                         TDisconnectReason::HandshakeFailPermanent());
                 }
-                TransitToErrorState(ev->Get()->Explanation + timeExplanation, false); 
+                TransitToErrorState(ev->Get()->Explanation + timeExplanation, false);
                 break;
         }
     }
diff --git a/library/cpp/actors/interconnect/logging.h b/library/cpp/actors/interconnect/logging.h
index c33654b84a..c429d1cade 100644
--- a/library/cpp/actors/interconnect/logging.h
+++ b/library/cpp/actors/interconnect/logging.h
@@ -20,13 +20,13 @@
         LOG_LOG(::NActors::TActivationContext::AsActorContext(), (priority), (component), "%s " marker " %s", LogPrefix.data(), Sprintf(__VA_ARGS__).data()); \
     } while (false)
 
-#define LOG_LOG_NET(priority, NODE_ID, FMT, ...) \ 
-    do { \ 
-        const TActorContext& ctx = ::NActors::TActivationContext::AsActorContext(); \ 
-        LOG_LOG(ctx, (priority), ::NActorsServices::INTERCONNECT_NETWORK, "[%" PRIu32 " <-> %" PRIu32 "] %s", \ 
-                ctx.SelfID.NodeId(), (NODE_ID), Sprintf(FMT, __VA_ARGS__).data()); \ 
-    } while (false) 
- 
+#define LOG_LOG_NET(priority, NODE_ID, FMT, ...) \
+    do { \
+        const TActorContext& ctx = ::NActors::TActivationContext::AsActorContext(); \
+        LOG_LOG(ctx, (priority), ::NActorsServices::INTERCONNECT_NETWORK, "[%" PRIu32 " <-> %" PRIu32 "] %s", \
+                ctx.SelfID.NodeId(), (NODE_ID), Sprintf(FMT, __VA_ARGS__).data()); \
+    } while (false)
+
 #define LOG_EMER_IC(marker, ...) LOG_LOG_IC(::NActorsServices::INTERCONNECT, marker, ::NActors::NLog::PRI_EMER, __VA_ARGS__)
 #define LOG_ALERT_IC(marker, ...) LOG_LOG_IC(::NActorsServices::INTERCONNECT, marker, ::NActors::NLog::PRI_ALERT, __VA_ARGS__)
 #define LOG_CRIT_IC(marker, ...) LOG_LOG_IC(::NActorsServices::INTERCONNECT, marker, ::NActors::NLog::PRI_CRIT, __VA_ARGS__)
@@ -45,8 +45,8 @@
 #define LOG_INFO_IC_SESSION(marker, ...) LOG_LOG_IC(::NActorsServices::INTERCONNECT_SESSION, marker, ::NActors::NLog::PRI_INFO, __VA_ARGS__)
 #define LOG_DEBUG_IC_SESSION(marker, ...) LOG_LOG_IC(::NActorsServices::INTERCONNECT_SESSION, marker, ::NActors::NLog::PRI_DEBUG, __VA_ARGS__)
 
-#define LOG_NOTICE_NET(NODE_ID, FMT, ...) LOG_LOG_NET(::NActors::NLog::PRI_NOTICE, NODE_ID, FMT, __VA_ARGS__) 
-#define LOG_DEBUG_NET(NODE_ID, FMT, ...) LOG_LOG_NET(::NActors::NLog::PRI_DEBUG, NODE_ID, FMT, __VA_ARGS__) 
+#define LOG_NOTICE_NET(NODE_ID, FMT, ...) LOG_LOG_NET(::NActors::NLog::PRI_NOTICE, NODE_ID, FMT, __VA_ARGS__)
+#define LOG_DEBUG_NET(NODE_ID, FMT, ...) LOG_LOG_NET(::NActors::NLog::PRI_DEBUG, NODE_ID, FMT, __VA_ARGS__)
 
 namespace NActors {
     class TInterconnectLoggingBase {