Improve logging and format.

src/syn_backbone.erl

@@ -166,7 +166,7 @@ handle_call({unlink_process, Pid}, _From, State) ->
     {reply, ok, State};
 
 handle_call(Request, From, State) ->
-    error_logger:warning_msg("Received from ~p an unknown call message: ~p~n", [Request, From]),
+    error_logger:warning_msg("Received from ~p an unknown call message: ~p", [Request, From]),
     {reply, undefined, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -178,7 +178,7 @@ handle_call(Request, From, State) ->
     {stop, Reason :: any(), #state{}}.
 
 handle_cast(Msg, State) ->
-    error_logger:warning_msg("Received an unknown cast message: ~p~n", [Msg]),
+    error_logger:warning_msg("Received an unknown cast message: ~p", [Msg]),
     {noreply, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -202,7 +202,7 @@ handle_info({'EXIT', Pid, Reason}, #state{
                     normal -> ok;
                     killed -> ok;
                     _ ->
-                        error_logger:warning_msg("Received an exit message from an unlinked process ~p with reason: ~p~n", [Pid, Reason])
+                        error_logger:warning_msg("Received an exit message from an unlinked process ~p with reason: ~p", [Pid, Reason])
                 end;
             Key ->
                 %% delete from table
@@ -212,7 +212,7 @@ handle_info({'EXIT', Pid, Reason}, #state{
                     normal -> ok;
                     killed -> ok;
                     _ ->
-                        error_logger:error_msg("Process with key ~p exited with reason: ~p~n", [Key, Reason])
+                        error_logger:error_msg("Process with key ~p exited with reason: ~p", [Key, Reason])
                 end,
                 %% callback
                 case ProcessExitCallbackModule of
@@ -225,7 +225,7 @@ handle_info({'EXIT', Pid, Reason}, #state{
     {noreply, State};
 
 handle_info(Info, State) ->
-    error_logger:warning_msg("Received an unknown info message: ~p~n", [Info]),
+    error_logger:warning_msg("Received an unknown info message: ~p", [Info]),
     {noreply, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -233,7 +233,7 @@ handle_info(Info, State) ->
 %% ----------------------------------------------------------------------------------------------------------
 -spec terminate(Reason :: any(), #state{}) -> terminated.
 terminate(Reason, _State) ->
-    error_logger:info_msg("Terminating syn backbone with reason: ~p~n", [Reason]),
+    error_logger:info_msg("Terminating syn backbone with reason: ~p", [Reason]),
     terminated.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -262,7 +262,7 @@ initdb_do() ->
         {storage_properties, [{ets, [{read_concurrency, true}]}]}
     ]) of
         {atomic, ok} ->
-            error_logger:info_msg("syn_processes_table was successfully created~n"),
+            error_logger:info_msg("syn_processes_table was successfully created"),
             ok;
         {aborted, {already_exists, syn_processes_table}} ->
             %% table already exists, try to add current node as copy
@@ -271,7 +271,7 @@ initdb_do() ->
             %% table already exists, try to add current node as copy
             add_table_copy_to_current_node();
         Other ->
-            error_logger:error_msg("Error while creating syn_processes_table: ~p~n", [Other]),
+            error_logger:error_msg("Error while creating syn_processes_table: ~p", [Other]),
             {error, Other}
     end.
 
@@ -283,16 +283,16 @@ add_table_copy_to_current_node() ->
     CurrentNode = node(),
     case mnesia:add_table_copy(syn_processes_table, CurrentNode, ram_copies) of
         {atomic, ok} ->
-            error_logger:info_msg("Copy of syn_processes_table was successfully added to current node~n"),
+            error_logger:info_msg("Copy of syn_processes_table was successfully added to current node"),
             ok;
         {aborted, {already_exists, syn_processes_table}} ->
-            error_logger:info_msg("Copy of syn_processes_table is already added to current node~n"),
+            error_logger:info_msg("Copy of syn_processes_table is already added to current node"),
             ok;
         {aborted, {already_exists, syn_processes_table, CurrentNode}} ->
-            error_logger:info_msg("Copy of syn_processes_table is already added to current node~n"),
+            error_logger:info_msg("Copy of syn_processes_table is already added to current node"),
             ok;
         {aborted, Reason} ->
-            error_logger:error_msg("Error while creating copy of syn_processes_table: ~p~n", [Reason]),
+            error_logger:error_msg("Error while creating copy of syn_processes_table: ~p", [Reason]),
             {error, Reason}
     end.
 

src/syn_netsplits.erl

@@ -98,7 +98,7 @@ init([]) ->
     {stop, Reason :: any(), #state{}}.
 
 handle_call(Request, From, State) ->
-    error_logger:warning_msg("Received from ~p an unknown call message: ~p~n", [Request, From]),
+    error_logger:warning_msg("Received from ~p an unknown call message: ~p", [Request, From]),
     {reply, undefined, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -110,7 +110,7 @@ handle_call(Request, From, State) ->
     {stop, Reason :: any(), #state{}}.
 
 handle_cast(Msg, State) ->
-    error_logger:warning_msg("Received an unknown cast message: ~p~n", [Msg]),
+    error_logger:warning_msg("Received an unknown cast message: ~p", [Msg]),
     {noreply, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -125,12 +125,12 @@ handle_info({mnesia_system_event, {inconsistent_database, Context, Node}}, #stat
     conflicting_process_callback_module = ConflictingProcessCallbackModule,
     conflicting_process_callback_function = ConflictingProcessCallbackFunction
 } = State) ->
-    error_logger:warning_msg("MNESIA signalled an inconsistent database on node: ~p with context: ~p, initiating automerge~n", [Node, Context]),
+    error_logger:warning_msg("MNESIA signalled an inconsistent database on node: ~p with context: ~p, initiating automerge", [Node, Context]),
     automerge(Node, ConflictingProcessCallbackModule, ConflictingProcessCallbackFunction),
     {noreply, State};
 
 handle_info({mnesia_system_event, {mnesia_down, Node}}, State) when Node =/= node() ->
-    error_logger:warning_msg("Received a MNESIA down event, removing all pids of node ~p~n", [Node]),
+    error_logger:warning_msg("Received a MNESIA down event, removing all pids of node ~p", [Node]),
     delete_pids_of_disconnected_node(Node),
     {noreply, State};
 
@@ -139,7 +139,7 @@ handle_info({mnesia_system_event, _MnesiaEvent}, State) ->
     {noreply, State};
 
 handle_info(Info, State) ->
-    error_logger:warning_msg("Received an unknown info message: ~p~n", [Info]),
+    error_logger:warning_msg("Received an unknown info message: ~p", [Info]),
     {noreply, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -147,7 +147,7 @@ handle_info(Info, State) ->
 %% ----------------------------------------------------------------------------------------------------------
 -spec terminate(Reason :: any(), #state{}) -> terminated.
 terminate(Reason, _State) ->
-    error_logger:info_msg("Terminating syn netsplits with reason: ~p~n", [Reason]),
+    error_logger:info_msg("Terminating syn netsplits with reason: ~p", [Reason]),
     terminated.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -179,9 +179,9 @@ delete_pids_of_disconnected_node(Node) ->
 automerge(RemoteNode, CallbackModule, CallbackFunction) ->
     global:trans({{?MODULE, automerge}, self()},
         fun() ->
-            error_logger:warning_msg("AUTOMERGE starting for remote node ~s (global lock is set)~n", [RemoteNode]),
+            error_logger:warning_msg("AUTOMERGE starting for remote node ~s (global lock is set)", [RemoteNode]),
             check_stitch(RemoteNode, CallbackModule, CallbackFunction),
-            error_logger:warning_msg("AUTOMERGE done (global lock will be unset)~n")
+            error_logger:warning_msg("AUTOMERGE done (global is about to be unset)")
         end).
 
 -spec check_stitch(RemoteNode :: atom(), CallbackModule :: atom(), CallbackFunction :: atom()) -> ok.
@@ -193,7 +193,7 @@ check_stitch(RemoteNode, CallbackModule, CallbackFunction) ->
             stitch(RemoteNode, CallbackModule, CallbackFunction),
             ok;
         Error ->
-            error_logger:error_msg("Could not check if node is stiched: ~p~n", [Error])
+            error_logger:error_msg("Could not check if node is stiched: ~p", [Error])
     end.
 
 -spec stitch(RemoteNode :: atom(), CallbackModule :: atom(), CallbackFunction :: atom()) ->
@@ -247,15 +247,18 @@ purge_double_processes_from_local_node(LocalProcessesInfo, RemoteProcessesInfo,
         case ets:lookup(Tab, Key) of
             [] -> ok;
             [{Key, LocalProcessPid}] ->
-                error_logger:warning_msg("Found a double process for ~s, killing it on local node~n", [Key]),
                 %% remove it from local mnesia table
                 mnesia:dirty_delete(syn_processes_table, Key),
                 %% remove it from ETS
                 ets:delete(Tab, Key),
                 %% kill or send message
                 case CallbackModule of
-                    undefined -> exit(LocalProcessPid, kill);
-                    _ -> spawn(fun() -> CallbackModule:CallbackFunction(Key, LocalProcessPid) end)
+                    undefined ->
+                        error_logger:warning_msg("Found a double process for ~s, killing it on local node ~p", [Key, node()]),
+                        exit(LocalProcessPid, kill);
+                    _ -> spawn(fun() ->
+                        error_logger:warning_msg("Found a double process for ~s, about to trigger callback on local node ~p", [Key, node()]),
+                        CallbackModule:CallbackFunction(Key, LocalProcessPid) end)
                 end
         end
     end,