Improve logging.

src/syn_backbone.erl

@@ -64,7 +64,7 @@ resume_local_syn_registry() ->
     ignore |
     {stop, Reason :: any()}.
 init([]) ->
-    error_logger:info_msg("Creating syn tables"),
+    error_logger:info_msg("Syn(~p): Creating tables", [node()]),
     case create_ram_tables() of
         ok ->
             %% monitor nodes
@@ -87,7 +87,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("Syn(~p): Received from ~p an unknown call message: ~p~n", [node(), Request, From]),
     {reply, undefined, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -99,7 +99,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("Syn(~p): Received an unknown cast message: ~p~n", [node(), Msg]),
     {noreply, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -111,14 +111,14 @@ handle_cast(Msg, State) ->
     {stop, Reason :: any(), #state{}}.
 
 handle_info({nodeup, RemoteNode}, State) ->
-    error_logger:info_msg("Node ~p has joined the cluster of local node ~p~n", [RemoteNode, node()]),
+    error_logger:info_msg("Syn(~p): Node ~p has joined the cluster~n", [node(), RemoteNode]),
     global:trans({{?MODULE, auto_merge_node_up}, self()},
         fun() ->
-            error_logger:info_msg("Merge: ----> Initiating on ~p for remote node ~p~n", [node(), RemoteNode]),
+            error_logger:warning_msg("Syn(~p): AUTOMERGE ----> Initiating for remote node ~p~n", [node(), RemoteNode]),
             %% request remote node process info & suspend remote registry
             RegistryTuples = rpc:call(RemoteNode, syn_registry, get_local_registry_tuples_and_suspend, [node()]),
             sync_registry_tuples(RemoteNode, RegistryTuples),
-            error_logger:error_msg("Merge: <---- Done on ~p for remote node ~p~n", [node(), RemoteNode])
+            error_logger:warning_msg("Syn(~p): AUTOMERGE <---- Done for remote node ~p~n", [node(), RemoteNode])
         end
     ),
     %% resume remote processes able to modify tables
@@ -127,12 +127,12 @@ handle_info({nodeup, RemoteNode}, State) ->
     {noreply, State};
 
 handle_info({nodedown, RemoteNode}, State) ->
-    error_logger:warning_msg("Node ~p has left the cluster of local node ~p~n", [RemoteNode, node()]),
+    error_logger:warning_msg("Syn(~p): Node ~p has left the cluster~n", [node(), RemoteNode]),
     purge_registry_entries_for_node(RemoteNode),
     {noreply, State};
 
 handle_info(Info, State) ->
-    error_logger:warning_msg("Received an unknown info message: ~p~n", [Info]),
+    error_logger:warning_msg("Syn(~p): Received an unknown info message: ~p~n", [node(), Info]),
     {noreply, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -140,8 +140,7 @@ handle_info(Info, State) ->
 %% ----------------------------------------------------------------------------------------------------------
 -spec terminate(Reason :: any(), #state{}) -> terminated.
 terminate(Reason, _State) ->
-    error_logger:info_msg("Terminating with reason: ~p~n", [Reason]),
-    error_logger:info_msg("Removing syn tables~n", [Reason]),
+    error_logger:info_msg("Syn(~p): Terminating with reason: ~p~n", [node(), Reason]),
     delete_ram_tables(),
     terminated.
 
@@ -203,8 +202,8 @@ sync_registry_tuples(RemoteNode, RegistryTuples) ->
                 ok;
             Entry ->
                 error_logger:warning_msg(
-                    "Conflicting name process found for: ~p, processes are ~p, ~p, killing local~n",
-                    [Name, Entry#syn_registry_table.pid, RemotePid]
+                    "Syn(~p): Conflicting name process found for: ~p, processes are ~p, ~p, killing local~n",
+                    [node(), Name, Entry#syn_registry_table.pid, RemotePid]
                 ),
                 %% kill the local one
                 exit(Entry#syn_registry_table.pid, kill)

src/syn_registry.erl

@@ -91,6 +91,20 @@ unregister(Name) ->
             gen_server:call({?MODULE, Node}, {unregister_on_node, Name})
     end.
 
+-spec count() -> non_neg_integer().
+count() ->
+    mnesia:table_info(syn_registry_table, size).
+
+-spec count(Node :: atom()) -> non_neg_integer().
+count(Node) ->
+    %% build match specs
+    MatchHead = #syn_registry_table{node = '$2', _ = '_'},
+    Guard = {'=:=', '$2', Node},
+    Result = '$2',
+    %% select
+    Processes = mnesia:dirty_select(syn_registry_table, [{MatchHead, [Guard], [Result]}]),
+    length(Processes).
+
 -spec sync_register(Name :: term(), Pid :: pid(), Meta :: term()) -> ok.
 sync_register(Name, Pid, Meta) ->
     gen_server:cast(?MODULE, {sync_register, Name, Pid, Meta}).
@@ -101,26 +115,12 @@ sync_unregister(Name) ->
 
 -spec get_local_registry_tuples_and_suspend(FromNode :: node()) -> list(syn_registry_tuple()).
 get_local_registry_tuples_and_suspend(FromNode) ->
-    error_logger:info_msg("Received request of local registry tuples from remote node: ~p~n", [FromNode]),
+    error_logger:info_msg("Syn(~p): Received request of local registry tuples from remote node: ~p~n", [node(), FromNode]),
     %% suspend self to not modify table
     sys:suspend(?MODULE),
     %% get tuples
     get_registry_tuples_of_current_node().
 
--spec count() -> non_neg_integer().
-count() ->
-    mnesia:table_info(syn_registry_table, size).
-
--spec count(Node :: atom()) -> non_neg_integer().
-count(Node) ->
-    %% build match specs
-    MatchHead = #syn_registry_table{node = '$2', _ = '_'},
-    Guard = {'=:=', '$2', Node},
-    Result = '$2',
-    %% select
-    Processes = mnesia:dirty_select(syn_registry_table, [{MatchHead, [Guard], [Result]}]),
-    length(Processes).
-
 %% ===================================================================
 %% Callbacks
 %% ===================================================================
@@ -190,7 +190,7 @@ handle_call({unregister_on_node, Name}, _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("Syn(~p): Received from ~p an unknown call message: ~p~n", [node(), Request, From]),
     {reply, undefined, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -214,7 +214,7 @@ handle_cast({sync_unregister, Name}, State) ->
     {noreply, State};
 
 handle_cast(Msg, State) ->
-    error_logger:warning_msg("Received an unknown cast message: ~p~n", [Msg]),
+    error_logger:warning_msg("Syn(~p): Received an unknown cast message: ~p~n", [node(), Msg]),
     {noreply, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -247,7 +247,7 @@ handle_info({'DOWN', _MonitorRef, process, 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("Syn(~p): Received an unknown info message: ~p~n", [node(), Info]),
     {noreply, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -255,7 +255,7 @@ handle_info(Info, State) ->
 %% ----------------------------------------------------------------------------------------------------------
 -spec terminate(Reason :: any(), #state{}) -> terminated.
 terminate(Reason, _State) ->
-    error_logger:info_msg("Terminating with reason: ~p~n", [Reason]),
+    error_logger:info_msg("Syn(~p): Terminating with reason: ~p~n", [node(), Reason]),
     terminated.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -317,13 +317,13 @@ log_process_exit(Name, Pid, Reason) ->
             case Name of
                 undefined ->
                     error_logger:error_msg(
-                        "Received a DOWN message from an unmonitored process ~p on local node ~p with reason: ~p~n",
-                        [Pid, node(), Reason]
+                        "Syn(~p): Received a DOWN message from an unmonitored process ~p with reason: ~p~n",
+                        [node(), Pid, Reason]
                     );
                 _ ->
                     error_logger:error_msg(
-                        "Process with name ~p and pid ~p on local node ~p exited with reason: ~p~n",
-                        [Name, Pid, node(), Reason]
+                        "Syn(~p): Process with name ~p and pid ~p exited with reason: ~p~n",
+                        [node(), Name, Pid, Reason]
                     )
             end
     end.