Roberto Ostinelli 5 лет назад
Родитель
Сommit
d31d23ca03
2 измененных файлов с 30 добавлено и 30 удалено
  1. 11 11
      src/syn_groups.erl
  2. 19 19
      src/syn_registry.erl

+ 11 - 11
src/syn_groups.erl

@@ -183,7 +183,7 @@ multi_call_reply(CallerPid, Reply) ->
 
 -spec sync_get_local_group_tuples(FromNode :: node()) -> list(syn_group_tuple()).
 sync_get_local_group_tuples(FromNode) ->
-    error_logger:info_msg("Syn(~p): Received request of local group tuples from remote node: ~p~n", [node(), FromNode]),
+    error_logger:info_msg("Syn(~p): Received request of local group tuples from remote node: ~p", [node(), FromNode]),
     get_group_tuples_for_node(node()).
 
 %% ===================================================================
@@ -247,7 +247,7 @@ handle_call({leave_on_node, GroupName, Pid}, _From, State) ->
     end;
 
 handle_call(Request, From, State) ->
-    error_logger:warning_msg("Syn(~p): Received from ~p an unknown call message: ~p~n", [node(), Request, From]),
+    error_logger:warning_msg("Syn(~p): Received from ~p an unknown call message: ~p", [node(), Request, From]),
     {reply, undefined, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -259,7 +259,7 @@ handle_call(Request, From, State) ->
     {stop, Reason :: any(), #state{}}.
 
 handle_cast(Msg, State) ->
-    error_logger:warning_msg("Syn(~p): Received an unknown cast message: ~p~n", [node(), Msg]),
+    error_logger:warning_msg("Syn(~p): Received an unknown cast message: ~p", [node(), Msg]),
     {noreply, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -293,31 +293,31 @@ handle_info({'DOWN', _MonitorRef, process, Pid, Reason}, State) ->
     {noreply, State};
 
 handle_info({nodeup, RemoteNode}, State) ->
-    error_logger:info_msg("Syn(~p): Node ~p has joined the cluster~n", [node(), RemoteNode]),
+    error_logger:info_msg("Syn(~p): Node ~p has joined the cluster", [node(), RemoteNode]),
     global:trans({{?MODULE, auto_merge_groups}, self()},
         fun() ->
-            error_logger:warning_msg("Syn(~p): GROUPS AUTOMERGE ----> Initiating for remote node ~p~n", [node(), RemoteNode]),
+            error_logger:warning_msg("Syn(~p): GROUPS AUTOMERGE ----> Initiating for remote node ~p", [node(), RemoteNode]),
             %% get group tuples from remote node
             GroupTuples = rpc:call(RemoteNode, ?MODULE, sync_get_local_group_tuples, [node()]),
             error_logger:warning_msg(
-                "Syn(~p): Received ~p group entrie(s) from remote node ~p~n",
+                "Syn(~p): Received ~p group entrie(s) from remote node ~p",
                 [node(), length(GroupTuples), RemoteNode]
             ),
             write_group_tuples_for_node(GroupTuples, RemoteNode),
             %% exit
-            error_logger:warning_msg("Syn(~p): GROUPS AUTOMERGE <---- Done for remote node ~p~n", [node(), RemoteNode])
+            error_logger:warning_msg("Syn(~p): GROUPS AUTOMERGE <---- Done for remote node ~p", [node(), RemoteNode])
         end
     ),
     %% resume
     {noreply, State};
 
 handle_info({nodedown, RemoteNode}, State) ->
-    error_logger:warning_msg("Syn(~p): Node ~p has left the cluster, removing group entries on local~n", [node(), RemoteNode]),
+    error_logger:warning_msg("Syn(~p): Node ~p has left the cluster, removing group entries on local", [node(), RemoteNode]),
     raw_purge_group_entries_for_node(RemoteNode),
     {noreply, State};
 
 handle_info(Info, State) ->
-    error_logger:warning_msg("Syn(~p): Received an unknown info message: ~p~n", [node(), Info]),
+    error_logger:warning_msg("Syn(~p): Received an unknown info message: ~p", [node(), Info]),
     {noreply, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -325,7 +325,7 @@ handle_info(Info, State) ->
 %% ----------------------------------------------------------------------------------------------------------
 -spec terminate(Reason :: any(), #state{}) -> terminated.
 terminate(Reason, _State) ->
-    error_logger:info_msg("Syn(~p): Terminating with reason: ~p~n", [node(), Reason]),
+    error_logger:info_msg("Syn(~p): Terminating with reason: ~p", [node(), Reason]),
     terminated.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -440,7 +440,7 @@ handle_process_down(GroupName, Pid, Meta, Reason, #state{
     case GroupName of
         undefined ->
             error_logger:warning_msg(
-                "Syn(~p): Received a DOWN message from an unjoined group process ~p with reason: ~p~n",
+                "Syn(~p): Received a DOWN message from an unjoined group process ~p with reason: ~p",
                 [node(), Pid, Reason]
             );
         _ ->

+ 19 - 19
src/syn_registry.erl

@@ -102,7 +102,7 @@ count(Node) ->
 
 -spec sync_get_local_registry_tuples(FromNode :: node()) -> [syn_registry_tuple()].
 sync_get_local_registry_tuples(FromNode) ->
-    error_logger:info_msg("Syn(~p): Received request of local registry tuples from remote node ~p~n", [node(), FromNode]),
+    error_logger:info_msg("Syn(~p): Received request of local registry tuples from remote node ~p", [node(), FromNode]),
     get_registry_tuples_for_node(node()).
 
 -spec raise_inconsistent_name_data(
@@ -189,7 +189,7 @@ handle_call({unregister_on_node, Name}, _From, State) ->
     end;
 
 handle_call(Request, From, State) ->
-    error_logger:warning_msg("Syn(~p): Received from ~p an unknown call message: ~p~n", [node(), Request, From]),
+    error_logger:warning_msg("Syn(~p): Received from ~p an unknown call message: ~p", [node(), Request, From]),
     {reply, undefined, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -201,19 +201,19 @@ handle_call(Request, From, State) ->
     {stop, Reason :: any(), #state{}}.
 
 handle_cast({inconsistent_name_data, OriginatingNode, Name, RemotePid, RemoteMeta}, State) ->
-    error_logger:warning_msg("Syn(~p): Inconsistent name ~p signalled from node ~p~n", [node(), Name, OriginatingNode]),
+    error_logger:warning_msg("Syn(~p): Inconsistent name ~p signalled from node ~p", [node(), Name, OriginatingNode]),
     global:trans({{?MODULE, auto_merge_registry}, self()},
         fun() ->
             case find_process_entry_by_name(Name) of
                 undefined ->
-                    error_logger:info_msg("Syn(~p): No local data for name ~p, skipping~n", [node(), Name]);
+                    error_logger:info_msg("Syn(~p): No local data for name ~p, skipping", [node(), Name]);
 
                 Entry ->
                     TablePid = Entry#syn_registry_table.pid,
                     TableMeta = Entry#syn_registry_table.meta,
 
                     error_logger:info_msg(
-                        "Syn(~p): REGISTRY NAME MERGE ----> Initiating for originating node ~p~n",
+                        "Syn(~p): REGISTRY NAME MERGE ----> Initiating for originating node ~p",
                         [node(), OriginatingNode]
                     ),
 
@@ -232,7 +232,7 @@ handle_cast({inconsistent_name_data, OriginatingNode, Name, RemotePid, RemoteMet
                     ),
 
                     error_logger:info_msg(
-                        "Syn(~p): REGISTRY NAME MERGE ----> Done for originating node ~p~n",
+                        "Syn(~p): REGISTRY NAME MERGE ----> Done for originating node ~p",
                         [node(), OriginatingNode]
                     )
             end
@@ -242,7 +242,7 @@ handle_cast({inconsistent_name_data, OriginatingNode, Name, RemotePid, RemoteMet
     {noreply, State};
 
 handle_cast(Msg, State) ->
-    error_logger:warning_msg("Syn(~p): Received an unknown cast message: ~p~n", [node(), Msg]),
+    error_logger:warning_msg("Syn(~p): Received an unknown cast message: ~p", [node(), Msg]),
     {noreply, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -277,14 +277,14 @@ handle_info({'DOWN', _MonitorRef, process, Pid, Reason}, State) ->
     {noreply, State};
 
 handle_info({nodeup, RemoteNode}, State) ->
-    error_logger:warning_msg("Syn(~p): Node ~p has joined the cluster~n", [node(), RemoteNode]),
+    error_logger:warning_msg("Syn(~p): Node ~p has joined the cluster", [node(), RemoteNode]),
     global:trans({{?MODULE, auto_merge_registry}, self()},
         fun() ->
-            error_logger:info_msg("Syn(~p): REGISTRY AUTOMERGE ----> Initiating for remote node ~p~n", [node(), RemoteNode]),
+            error_logger:info_msg("Syn(~p): REGISTRY AUTOMERGE ----> Initiating for remote node ~p", [node(), RemoteNode]),
             %% get registry tuples from remote node
             RegistryTuples = rpc:call(RemoteNode, ?MODULE, sync_get_local_registry_tuples, [node()]),
             error_logger:info_msg(
-                "Syn(~p): Received ~p registry tuple(s) from remote node ~p~n",
+                "Syn(~p): Received ~p registry tuple(s) from remote node ~p",
                 [node(), length(RegistryTuples), RemoteNode]
             ),
             %% ensure that registry doesn't have any joining node's entries (here again for race conditions)
@@ -307,7 +307,7 @@ handle_info({nodeup, RemoteNode}, State) ->
                         LocalMeta = Entry#syn_registry_table.meta,
 
                         error_logger:warning_msg(
-                            "Syn(~p): Conflicting name in auto merge for: ~p, processes are ~p, ~p~n",
+                            "Syn(~p): Conflicting name in auto merge for: ~p, processes are ~p, ~p",
                             [node(), Name, {LocalPid, LocalMeta}, {RemotePid, RemoteMeta}]
                         ),
 
@@ -327,19 +327,19 @@ handle_info({nodeup, RemoteNode}, State) ->
             %% add to table
             lists:foreach(F, RegistryTuples),
             %% exit
-            error_logger:info_msg("Syn(~p): REGISTRY AUTOMERGE <---- Done for remote node ~p~n", [node(), RemoteNode])
+            error_logger:info_msg("Syn(~p): REGISTRY AUTOMERGE <---- Done for remote node ~p", [node(), RemoteNode])
         end
     ),
     %% resume
     {noreply, State};
 
 handle_info({nodedown, RemoteNode}, State) ->
-    error_logger:warning_msg("Syn(~p): Node ~p has left the cluster, removing registry entries on local~n", [node(), RemoteNode]),
+    error_logger:warning_msg("Syn(~p): Node ~p has left the cluster, removing registry entries on local", [node(), RemoteNode]),
     purge_registry_entries_for_remote_node(RemoteNode),
     {noreply, State};
 
 handle_info(Info, State) ->
-    error_logger:warning_msg("Syn(~p): Received an unknown info message: ~p~n", [node(), Info]),
+    error_logger:warning_msg("Syn(~p): Received an unknown info message: ~p", [node(), Info]),
     {noreply, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -347,7 +347,7 @@ handle_info(Info, State) ->
 %% ----------------------------------------------------------------------------------------------------------
 -spec terminate(Reason :: any(), #state{}) -> terminated.
 terminate(Reason, _State) ->
-    error_logger:info_msg("Syn(~p): Terminating with reason: ~p~n", [node(), Reason]),
+    error_logger:info_msg("Syn(~p): Terminating with reason: ~p", [node(), Reason]),
     terminated.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -462,7 +462,7 @@ handle_process_down(Name, Pid, Meta, Reason, #state{
                     syn_event_handler:do_on_process_exit(KillName, Pid, KillMeta, syn_resolve_kill, CustomEventHandler);
                 _ ->
                     error_logger:warning_msg(
-                        "Syn(~p): Received a DOWN message from an unregistered process ~p with reason: ~p~n",
+                        "Syn(~p): Received a DOWN message from an unregistered process ~p with reason: ~p",
                         [node(), Pid, Reason]
                     )
             end;
@@ -519,7 +519,7 @@ resolve_conflict(
         TablePid ->
             %% keep local
             error_logger:error_msg(
-                "Syn(~p): Keeping local process ~p, killing remote ~p~n",
+                "Syn(~p): Keeping local process ~p, killing remote ~p",
                 [node(), TablePid, RemotePid]
             ),
             case KillOther of
@@ -531,7 +531,7 @@ resolve_conflict(
         RemotePid ->
             %% keep remote
             error_logger:error_msg(
-                "Syn(~p): Keeping remote process ~p, killing local ~p~n",
+                "Syn(~p): Keeping remote process ~p, killing local ~p",
                 [node(), RemotePid, TablePid]
             ),
             case KillOther of
@@ -547,7 +547,7 @@ resolve_conflict(
 
         Other ->
             error_logger:error_msg(
-                "Syn(~p): Custom handler returned ~p, valid options were ~p and ~p~n",
+                "Syn(~p): Custom handler returned ~p, valid options were ~p and ~p",
                 [node(), Other, TablePid, RemotePid]
             )
     end.