Browse Source

Improve various naming.

Roberto Ostinelli 5 years ago
parent
commit
544bf91bb3
4 changed files with 12 additions and 19 deletions
  1. 3 3
      README.md
  2. 1 1
      src/syn_groups.erl
  3. 6 13
      src/syn_registry.erl
  4. 2 2
      test/syn_test_event_handler.erl

+ 3 - 3
README.md

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

+ 1 - 1
src/syn_groups.erl

@@ -440,7 +440,7 @@ handle_process_down(GroupName, Pid, Meta, Reason, #state{
     case GroupName of
     case GroupName of
         undefined ->
         undefined ->
             error_logger:warning_msg(
             error_logger:warning_msg(
-                "Syn(~p): Received a DOWN message from an unmonitored group process ~p with reason: ~p~n",
+                "Syn(~p): Received a DOWN message from an unjoined group process ~p with reason: ~p~n",
                 [node(), Pid, Reason]
                 [node(), Pid, Reason]
             );
             );
         _ ->
         _ ->

+ 6 - 13
src/syn_registry.erl

@@ -369,7 +369,7 @@ add_remote_to_local_table(Name, RemotePid, RemoteMeta, State) ->
 
 
                             error_logger:warning_msg(
                             error_logger:warning_msg(
                                 "Syn(~p): Conflicting name from multicast found for: ~p, processes are ~p, ~p~n",
                                 "Syn(~p): Conflicting name from multicast found for: ~p, processes are ~p, ~p~n",
-                                [node(), Name, LocalPid, RemotePid]
+                                [node(), Name, {LocalPid, LocalMeta}, {RemotePid, RemoteMeta}]
                             ),
                             ),
 
 
                             resolve_conflict(Name, {LocalPid, LocalMeta}, {RemotePid, RemoteMeta},
                             resolve_conflict(Name, {LocalPid, LocalMeta}, {RemotePid, RemoteMeta},
@@ -469,17 +469,10 @@ handle_process_down(Name, Pid, Meta, Reason, #state{
 }) ->
 }) ->
     case Name of
     case Name of
         undefined ->
         undefined ->
-            case Reason of
-                normal -> ok;
-                shutdown -> ok;
-                {shutdown, _} -> ok;
-                killed -> ok;
-                _ ->
-                    error_logger:warning_msg(
-                        "Syn(~p): Received a DOWN message from an unmonitored process ~p with reason: ~p~n",
-                        [node(), Pid, Reason]
-                    )
-            end;
+            error_logger:warning_msg(
+                "Syn(~p): Received a DOWN message from an unregistered process ~p with reason: ~p~n",
+                [node(), Pid, Reason]
+            );
         _ ->
         _ ->
             syn_event_handler:do_on_process_exit(Name, Pid, Meta, Reason, CustomEventHandler)
             syn_event_handler:do_on_process_exit(Name, Pid, Meta, Reason, CustomEventHandler)
     end.
     end.
@@ -502,7 +495,7 @@ sync_registry_tuples(RemoteNode, RegistryTuples, State) ->
 
 
                 error_logger:warning_msg(
                 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~n",
-                    [node(), Name, LocalPid, RemotePid]
+                    [node(), Name, {LocalPid, LocalMeta}, {RemotePid, RemoteMeta}]
                 ),
                 ),
 
 
                 resolve_conflict(Name, {LocalPid, LocalMeta}, {RemotePid, RemoteMeta},
                 resolve_conflict(Name, {LocalPid, LocalMeta}, {RemotePid, RemoteMeta},

+ 2 - 2
test/syn_test_event_handler.erl

@@ -58,8 +58,8 @@ on_group_process_exit(_GroupName, _Pid, _Meta, _Reason) ->
 
 
 -spec resolve_registry_conflict(
 -spec resolve_registry_conflict(
     Name :: any(),
     Name :: any(),
-    {Pid1 :: pid(), Meta1 :: any()},
-    {Pid2 :: pid(), Meta2 :: any()}
+    {LocalPid :: pid(), LocalMeta :: any()},
+    {RemotePid :: pid(), RemoteMeta :: any()}
 ) -> PidToKeep :: pid().
 ) -> PidToKeep :: pid().
 resolve_registry_conflict(_Name, {LocalPid, keep_this_one}, {_RemotePid, _RemoteMeta}) ->
 resolve_registry_conflict(_Name, {LocalPid, keep_this_one}, {_RemotePid, _RemoteMeta}) ->
     LocalPid;
     LocalPid;