From 7a241193c75a35107ea7697b86d2189a94c3ecc8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Christopher=20Cot=C3=A9?= <ccote@cohesionib.com>
Date: Fri, 22 Jan 2021 09:59:06 -0600
Subject: [PATCH] add realm to log messages

---
 lib/router/session.ex | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/lib/router/session.ex b/lib/router/session.ex
index 16a2d8e..7773330 100644
--- a/lib/router/session.ex
+++ b/lib/router/session.ex
@@ -254,7 +254,7 @@ defmodule Wampex.Router.Session do
           wc = RealmSession.subscribe(db, realm, topic, {id, {self(), Node.self()}}, opts)
           send_to_peer(Broker.subscribed(%Subscribed{request_id: rid, subscription_id: id}), tt, t)
 
-          Logger.info("Subscription #{id}: #{topic}")
+          Logger.info("Subscription #{id}: #{realm} - #{topic}")
 
           {%SL{sl | data: %Sess{data | subscriptions: [{id, topic, wc} | subs]}},
            [{:next_event, :internal, :transition}]}
@@ -286,7 +286,7 @@ defmodule Wampex.Router.Session do
     subs = RealmSession.unsubscribe(db, realm, {subscription_id, {self(), Node.self()}}, subs)
 
     send_to_peer(Broker.unsubscribed(%Unsubscribed{request_id: rid}), tt, t)
-    Logger.info("Unsubscribe: #{subscription_id}")
+    Logger.info("Unsubscribe: #{realm} - #{subscription_id}")
     {:ok, %SL{sl | data: %Sess{sl.data | subscriptions: subs}}, [{:next_event, :internal, :transition}]}
   end
 
@@ -337,7 +337,7 @@ defmodule Wampex.Router.Session do
               :noop
           end
 
-          Logger.info("Published #{pub_id}: #{topic}")
+          Logger.info("Published #{pub_id}: #{realm} - #{topic}")
           {sl, [{:next_event, :internal, :transition}]}
 
         false ->
@@ -368,7 +368,7 @@ defmodule Wampex.Router.Session do
     regs = RealmSession.unregister(db, realm, {registration_id, {self(), Node.self()}}, regs)
 
     send_to_peer(Dealer.unregistered(%Unregistered{request_id: request_id}), tt, t)
-    Logger.info("Unregister: #{registration_id}")
+    Logger.info("Unregister: #{realm} - #{registration_id}")
     {:ok, %SL{sl | data: %Sess{data | registrations: regs}}, [{:next_event, :internal, :transition}]}
   end
 
@@ -400,7 +400,7 @@ defmodule Wampex.Router.Session do
           regd = %Registered{request_id: rid, registration_id: id}
           send_to_peer(Dealer.registered(regd), tt, t)
 
-          Logger.info("Registered #{id}: #{procedure}")
+          Logger.info("Registered #{id}: #{realm} - #{procedure}")
 
           {%SL{sl | data: %Sess{data | registrations: [{id, procedure} | regs]}},
            [{:next_event, :internal, :transition}]}
@@ -464,7 +464,7 @@ defmodule Wampex.Router.Session do
 
             RealmSession.round_robin(db, realm, proc, length(callees))
 
-            Logger.info("Call #{req_id}: #{proc}")
+            Logger.info("Call #{req_id}: #{realm} - #{proc}")
             {%SL{sl | data: %Sess{data | request_id: req_id}}, [{:next_event, :internal, :transition}]}
           else
             {:error, :no_live_callees} ->
@@ -478,6 +478,7 @@ defmodule Wampex.Router.Session do
                 t
               )
 
+              Logger.info("No Callees: #{realm} - #{proc}")
               {sl, [{:next_event, :internal, :transition}]}
 
             :not_found ->
@@ -511,6 +512,7 @@ defmodule Wampex.Router.Session do
           data: %Sess{
             proxy: proxy,
             invocations: inv,
+            realm: realm,
             yield: %Yield{request_id: id, options: opts, arg_list: arg_l, arg_kw: arg_kw}
           }
         } = data
@@ -532,7 +534,7 @@ defmodule Wampex.Router.Session do
         _ -> true
       end)
 
-    Logger.info("Yield #{id}")
+    Logger.info("Yield: #{realm} - #{id}")
     {:ok, %SL{data | data: %Sess{data.data | invocations: inv, yield: nil}}, [{:next_event, :internal, :transition}]}
   end
 
@@ -545,6 +547,7 @@ defmodule Wampex.Router.Session do
           data: %Sess{
             proxy: proxy,
             invocations: inv,
+            realm: realm,
             error: %Error{request_id: id, details: dets, arg_list: arg_l, error: err, arg_kw: arg_kw}
           }
         } = data
@@ -566,7 +569,7 @@ defmodule Wampex.Router.Session do
         _ -> true
       end)
 
-    Logger.info("Call Error #{id}: #{get_in(dets, ["procedure"])}")
+    Logger.info("Call Error #{id}: #{realm} - #{get_in(dets, ["procedure"])}")
     {:ok, %SL{data | data: %Sess{data.data | invocations: inv}}, [{:next_event, :internal, :transition}]}
   end
 
@@ -575,11 +578,11 @@ defmodule Wampex.Router.Session do
         @handle_abort,
         _,
         @abort,
-        %SL{data: %Sess{transport: tt, transport_pid: t, error: er}} = data
+        %SL{data: %Sess{transport: tt, transport_pid: t, realm: realm, error: er}} = data
       ) do
     send_to_peer(Peer.abort(%Abort{reason: er}), tt, t)
 
-    Logger.info("Abort")
+    Logger.info("Abort: #{realm} #{inspect(er)}")
     {:ok, data, []}
   end
 
@@ -588,11 +591,11 @@ defmodule Wampex.Router.Session do
         @handle_goodbye,
         _,
         @goodbye,
-        %SL{data: %Sess{transport: tt, transport_pid: t, goodbye: goodbye}} = data
+        %SL{data: %Sess{transport: tt, transport_pid: t, goodbye: goodbye, realm: realm}} = data
       ) do
     send_to_peer(Peer.goodbye(goodbye), tt, t)
 
-    Logger.info("Goodbye")
+    Logger.info("Goodbye: #{realm}")
     {:ok, data, []}
   end
 
@@ -728,6 +731,8 @@ defmodule Wampex.Router.Session do
           t
         )
 
+        Logger.info("Welcome #{authid}: #{realm}")
+
         {[{:next_event, :internal, :transition}], proxy, peer}
 
       {false, peer} ->
-- 
2.45.3