From c73ec7998934b85f7b40ccb5755b160667ee3224 Mon Sep 17 00:00:00 2001 From: Christopher Date: Mon, 17 Feb 2020 16:14:54 -0600 Subject: [PATCH] move more logging to debug logging. don't track cast_send_request --- lib/test.ex | 26 +++++++++++++++----------- lib/wampex/session.ex | 12 +++++------- lib/wampex/transports/web_socket.ex | 6 +++--- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/lib/test.ex b/lib/test.ex index 8144718..46e9a03 100644 --- a/lib/test.ex +++ b/lib/test.ex @@ -1,6 +1,7 @@ defmodule Test do alias Wampex.{Realm, Session} alias Wampex.Role.{Callee, Caller, Publisher, Subscriber} + require Logger @url "ws://localhost:18080/ws" @realm %Realm{name: "com.myrealm"} @@ -64,17 +65,20 @@ defmodule Test do Wampex.start_link(TestCaller, @session) :timer.sleep(500) - Wampex.send_request( - TestCaller, - Caller.call( - "com.actuator.#{@device}.light", - [1], - %{ - color: "#FFFFFF" - }, - %{} + resp = + Wampex.send_request( + TestCaller, + Caller.call( + "com.actuator.#{@device}.light", + [1], + %{ + color: "#FFFFFF" + }, + %{} + ) ) - ) + + Logger.info("Got Response: #{inspect(resp)}") end def subscribe do @@ -87,7 +91,7 @@ defmodule Test do Wampex.start_link(TestPublisher, @session) :timer.sleep(500) - Enum.each(1..10, fn _ -> + Enum.each(1..100, fn _ -> Wampex.cast_send_request( TestPublisher, Publisher.publish("com.data.temp", [12.5, 45.6, 87.5], %{loc: "60645"}, %{}) diff --git a/lib/wampex/session.ex b/lib/wampex/session.ex index 762335e..00f688e 100644 --- a/lib/wampex/session.ex +++ b/lib/wampex/session.ex @@ -122,7 +122,7 @@ defmodule Wampex.Session do {:ok, %SL{ data - | data: %Sess{sess | request_id: request_id, requests: [{request_id, nil} | sess.requests]} + | data: %Sess{sess | request_id: request_id} }, []} end @@ -167,7 +167,6 @@ defmodule Wampex.Session do @impl true def handle_resource("Abort", _, "Abort", data) do - Logger.info("Aborting...") {:ok, data, []} end @@ -178,13 +177,12 @@ defmodule Wampex.Session do "WaitForTransport", data ) do - Logger.info("Waiting for transport to connect...") + Logger.debug("Waiting for transport to connect...") {:ok, %SL{data | data: %Sess{data.data | roles: [Peer | data.data.roles]}}, []} end @impl true def handle_resource("Established", _, "Established", data) do - Logger.info("Session #{data.data.id}") {:ok, data, []} end @@ -195,7 +193,7 @@ defmodule Wampex.Session do "Event", %SL{data: %Sess{name: name, event: event}} = sl ) do - Logger.info("Received Event #{inspect(event)}") + Logger.debug("Received Event #{inspect(event)}") sub = Wampex.subscriber_registry_name(name) @@ -213,7 +211,7 @@ defmodule Wampex.Session do "Invocation", %SL{data: %Sess{name: name, invocation: invocation}} = sl ) do - Logger.info("Received Invocation #{inspect(invocation)}") + Logger.debug("Received Invocation #{inspect(invocation)}") reg = Wampex.callee_registry_name(name) Registry.dispatch(reg, elem(invocation, 2), fn entries -> @@ -225,7 +223,7 @@ defmodule Wampex.Session do @impl true def handle_resource(resource, _, state, data) do - Logger.info("No specific resource handler for #{resource} in state #{state}") + Logger.error("No specific resource handler for #{resource} in state #{state}") {:ok, data, []} end diff --git a/lib/wampex/transports/web_socket.ex b/lib/wampex/transports/web_socket.ex index bd44381..b4080e6 100644 --- a/lib/wampex/transports/web_socket.ex +++ b/lib/wampex/transports/web_socket.ex @@ -34,7 +34,7 @@ defmodule Wampex.Transport.WebSocket do @impl true def handle_connect(%Conn{host: h, port: p, path: pa, query: q} = _conn, state) do - Logger.info("Connected to #{h}:#{p}#{pa}?#{q}") + Logger.debug("Connected to #{h}:#{p}#{pa}?#{q}") Process.send_after(self(), :ping, @ping_interval) send(state.session, {:connected, true}) {:ok, %{state | connected: true}} @@ -52,7 +52,7 @@ defmodule Wampex.Transport.WebSocket do @impl true def handle_cast({:send_request, data}, %{serializer: s} = state) do - Logger.info("Sending Request #{inspect(data)}") + Logger.debug("Sending Request #{inspect(data)}") {:reply, {s.data_type(), s.serialize!(data)}, state} end @@ -71,7 +71,7 @@ defmodule Wampex.Transport.WebSocket do @impl true def handle_frame({type, message}, %{serializer: s} = state) do message = s.deserialize!(message) - Logger.info("Received #{type} data: #{inspect(message)}") + Logger.debug("Received #{type} data: #{inspect(message)}") send(state.session, {:set_message, message}) {:ok, state} end -- 2.45.3