Improve logging.

README.md

@@ -442,10 +442,10 @@ on_group_process_exit(GroupName, Pid, Meta, Reason) ->
 
 -spec resolve_registry_conflict(
     Name :: any(),
-    {LocalPid :: pid(), LocalMeta :: any()},
-    {RemotePid :: pid(), RemoteMeta :: any()}
+    {Pid1 :: pid(), Meta1 :: any()},
+    {Pid2 :: pid(), Meta2 :: any()}
 ) -> PidToKeep :: pid().
-resolve_registry_conflict(Name, {LocalPid, LocalMeta}, {RemotePid, RemoteMeta}) ->
+resolve_registry_conflict(Name, {Pid1, Meta1}, {Pid2, Meta2}) ->
     Pid1.
 ```
 

src/syn_event_handler.erl

@@ -93,14 +93,14 @@ do_on_group_process_exit(GroupName, Pid, Meta, Reason, CustomEventHandler) ->
 
 -spec do_resolve_registry_conflict(
     Name :: any(),
-    {LocalPid :: pid(), LocalMeta :: any()},
-    {RemotePid :: pid(), RemoteMeta :: any()},
+    {Pid1 :: pid(), Meta1 :: any()},
+    {Pid2 :: pid(), Meta2 :: any()},
     CustomEventHandler :: module()
 ) -> {PidToKeep :: pid() | undefined, KillOther :: boolean()}.
-do_resolve_registry_conflict(Name, {LocalPid, LocalMeta}, {RemotePid, RemoteMeta}, CustomEventHandler) ->
+do_resolve_registry_conflict(Name, {Pid1, Meta1}, {Pid2, Meta2}, CustomEventHandler) ->
     case erlang:function_exported(CustomEventHandler, resolve_registry_conflict, 3) of
         true ->
-            try CustomEventHandler:resolve_registry_conflict(Name, {LocalPid, LocalMeta}, {RemotePid, RemoteMeta}) of
+            try CustomEventHandler:resolve_registry_conflict(Name, {Pid1, Meta1}, {Pid2, Meta2}) of
                 PidToKeep when is_pid(PidToKeep) ->
                     {PidToKeep, false};
                 _ ->
@@ -113,6 +113,6 @@ do_resolve_registry_conflict(Name, {LocalPid, LocalMeta}, {RemotePid, RemoteMeta
                 {undefined, false}
             end;
         _ ->
-            %% by default, keep local pid
-            {LocalPid, true}
+            %% by default, keep pid in table
+            {Pid1, true}
     end.

src/syn_groups.erl

@@ -300,7 +300,7 @@ handle_info({nodeup, RemoteNode}, State) ->
             %% 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, writing to local~n",
+                "Syn(~p): Received ~p group entrie(s) from remote node ~p~n",
                 [node(), length(GroupTuples), RemoteNode]
             ),
             write_group_tuples_for_node(GroupTuples, RemoteNode),

src/syn_registry.erl

@@ -214,12 +214,12 @@ handle_cast({inconsistent_name_data, OriginatingNode, Name, RemotePid, RemoteMet
                         "Syn(~p): REGISTRY NAME MERGE ----> Initiating for originating node ~p~n",
                         [node(), OriginatingNode]
                     ),
-                    LocalPid = Entry#syn_registry_table.pid,
-                    LocalMeta = Entry#syn_registry_table.meta,
-                    resolve_conflict(Name, {LocalPid, LocalMeta}, {RemotePid, RemoteMeta},
-                        %% keep local
+                    PidInTable = Entry#syn_registry_table.pid,
+                    MetaInTable = Entry#syn_registry_table.meta,
+                    resolve_conflict(Name, {PidInTable, MetaInTable}, {RemotePid, RemoteMeta},
+                        %% keep currently in table
                         fun() ->
-                            ok = rpc:call(OriginatingNode, syn_registry, add_to_local_table, [Name, LocalPid, LocalMeta, undefined])
+                            ok = rpc:call(OriginatingNode, syn_registry, add_to_local_table, [Name, PidInTable, MetaInTable, undefined])
                         end,
                         %% keep remote
                         fun() ->
@@ -281,7 +281,7 @@ handle_info({nodeup, RemoteNode}, State) ->
             %% 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, writing to local~n",
+                "Syn(~p): Received ~p registry tuple(s) from remote node ~p~n",
                 [node(), length(RegistryTuples), RemoteNode]
             ),
             %% ensure that registry doesn't have any joining node's entries (here again for race conditions)
@@ -465,47 +465,47 @@ handle_process_down(Name, Pid, Meta, Reason, #state{
     KeepRemoteFun :: fun(),
     #state{}
 ) -> ok.
-resolve_conflict(Name, {LocalPid, LocalMeta}, {RemotePid, RemoteMeta}, KeepLocalFun, KeepRemoteFun, #state{
+resolve_conflict(Name, {PidInTable, MetaInTable}, {RemotePid, RemoteMeta}, KeepTableFun, KeepRemoteFun, #state{
     custom_event_handler = CustomEventHandler
 }) ->
     %% call conflict resolution
     {PidToKeep, KillOther} = syn_event_handler:do_resolve_registry_conflict(
         Name,
-        {LocalPid, LocalMeta},
+        {PidInTable, MetaInTable},
         {RemotePid, RemoteMeta},
         CustomEventHandler
     ),
 
     %% keep chosen one
     case PidToKeep of
-        LocalPid ->
+        PidInTable ->
             %% keep local
             error_logger:error_msg(
                 "Syn(~p): Keeping local process ~p, killing remote ~p~n",
-                [node(), LocalPid, RemotePid]
+                [node(), PidInTable, RemotePid]
             ),
-            KeepLocalFun(),
             case KillOther of
                 true -> exit(RemotePid, kill);
                 _ -> ok
-            end;
+            end,
+            KeepTableFun();
 
         RemotePid ->
             %% keep remote
             error_logger:error_msg(
                 "Syn(~p): Keeping remote process ~p, killing local ~p~n",
-                [node(), RemotePid, LocalPid]
+                [node(), RemotePid, PidInTable]
             ),
-            KeepRemoteFun(),
             case KillOther of
-                true -> exit(LocalPid, kill);
+                true -> exit(PidInTable, kill);
                 _ -> ok
-            end;
+            end,
+            KeepRemoteFun();
 
         Other ->
             error_logger:error_msg(
                 "Syn(~p): Custom handler returned ~p, valid options were ~p and ~p~n",
-                [node(), Other, LocalPid, RemotePid]
+                [node(), Other, PidInTable, RemotePid]
             )
     end.