convert ws msg types, reduce debugging

5 files changed, 20 insertions, 34 deletions

diff --git a/components/dlink_tls/src/dlink_tls_rpc.erl b/components/dlink_tls/src/dlink_tls_rpc.erl
index 5d78918..14d580a 100644
--- a/components/dlink_tls/src/dlink_tls_rpc.erl
+++ b/components/dlink_tls/src/dlink_tls_rpc.erl
@@ -335,7 +335,7 @@ handle_socket(_FromPid, SetupIP, SetupPort, error, _CS) ->
 handle_socket(FromPid, PeerIP, PeerPort, data, Elems, CompSpec) ->
 
     ?debug("PeerIP = ~p, PeerPort = ~p", [PeerIP, PeerPort]),
-    ?debug("data(): Elems ~p~nCS = ~p", [abbrev(Elems), abbrev(CompSpec)]),
+    ?debug("data(): Elems ~p", [abbrev(Elems)]),
 
     CS = rvi_common:pick_up_json_log_id(Elems, CompSpec),
 
@@ -816,10 +816,7 @@ opt(K, L, Def) ->
     end.
 
 opts(Keys, Elems, Def) ->
-    Res = [ opt(K, Elems, Def) || K <- Keys],
-    ?debug("opts(~p) -> ~p", [Keys, abbrev(Elems)]),
-    Res.
-
+    [ opt(K, Elems, Def) || K <- Keys].
 
 log_orphan(Pfx, Fmt, Args) ->
     start_log(Pfx, Fmt, Args, #component_spec{}).
diff --git a/components/rvi_common/src/rvi_common.erl b/components/rvi_common/src/rvi_common.erl
index 1c4540f..d3287c3 100644
--- a/components/rvi_common/src/rvi_common.erl
+++ b/components/rvi_common/src/rvi_common.erl
@@ -186,25 +186,21 @@ notification(Component,
     InArg = [ Val || { _Key, Val } <- InArgPropList ],
     InArgSpec = [ Key || { Key, _Val } <- InArgPropList ],
     %% Figure out how we are to invoke this MFA.
-    ?debug("~p:notification(", [?MODULE]),
-    ?debug("      Component : ~p", [Component]),
-    ?debug("         Module : ~p", [Module]),
-    ?debug("       Function : ~p", [Function]),
-    ?debug("  InArgPropList : ~p", [InArgPropList]),
+    ?debug("notify [~w]~w:~w - ~p", [Component, Module, Function,
+				     InArgPropList]),
 
     case get_module_type(Component, Module, CompSpec) of
 	%% We have a gen_server
 	{ ok, gen_server } ->
-	    ?debug("Sending ~p - ~p:~p(~p)", [Component, Module, Function, InArg]),
+	    ?debug("via gen_server (~p)", [Module]),
 	    gen_server:cast(Module, { rvi, Function, InArg}),
 	    ok;
 
 	%% We have a JSON-RPC server
 	{ ok,  json_rpc } ->
 	    URL = get_module_json_rpc_url(Component, Module, CompSpec),
-	    ?debug("Sending ~p:~p(~p) -> ~p.", [Module, Function, InArg, URL]),
+	    ?debug("Sending via URL=~p", [URL]),
 	    JSONArg = json_argument(InArg, InArgSpec),
-	    ?debug("Sending ~p:~p(~p) -> ~p.", [Module, Function, InArg, JSONArg]),
 	    send_json_notification(URL, atom_to_binary(Function, latin1),  JSONArg),
 	    ok;
 	{ error, _ } = Error ->
diff --git a/components/service_discovery/src/service_discovery_rpc.erl b/components/service_discovery/src/service_discovery_rpc.erl
index bd7ab54..73673d7 100644
--- a/components/service_discovery/src/service_discovery_rpc.erl
+++ b/components/service_discovery/src/service_discovery_rpc.erl
@@ -91,20 +91,14 @@ get_modules_by_service(CompSpec, Service) ->
 
 
 register_services(CompSpec, Services, DataLinkModule) ->
-    ?debug("~p:register_services()", [?MODULE]),
-    ?debug("     CompSpec : ~p", [authorize_keys:abbrev(CompSpec)]),
-    ?debug("     Services : ~p", [Services]),
-    ?debug("  DataLinkMod : ~p", [DataLinkModule]),
+    ?debug("register_services(Mod=~p): ~p", [DataLinkModule, Services]),
     rvi_common:notification(service_discovery, ?MODULE, register_services,
 			    [{ services, Services },
 			     { data_link_module, DataLinkModule }],
 			    CompSpec).
 
 unregister_services(CompSpec, Services, DataLinkModule) ->
-    ?debug("~p:unregister_services()", [?MODULE]),
-    ?debug("     CompSpec : ", [CompSpec]),
-    ?debug("     Services : ", [Services]),
-    ?debug("  DataLinkMod : ", [DataLinkModule]),
+    ?debug("unregister_services(Mod=~p): ~p", [DataLinkModule, Services]),
     rvi_common:notification(service_discovery, ?MODULE, unregister_services,
 			    [{ services,  Services },
 			     { data_link_module, DataLinkModule}],
@@ -302,9 +296,6 @@ code_change(_OldVsn, St, _Extra) ->
 
 
 register_single_service_(Service, DataLinkModule) ->
-    ?info("svc_disc:register_single_service_(~p:~p)",
-	  [DataLinkModule,Service]),
-
     %% Delete any previous instances of the given entry, in case
     %% the service registers multiple times
     ets:match_delete(?MODULE_TABLE,
@@ -337,10 +328,6 @@ register_single_service_(Service, DataLinkModule) ->
 
 
 unregister_single_service_(Service, DataLinkModule) ->
-    ?info("svc_disc:unregister_single_service_(): ~p:~p",
-	  [DataLinkModule, Service]),
-
-
     %% Delete any service table entries with a matching Service.
     ets:match_delete(?SERVICE_TABLE,
 		     #service_entry {
diff --git a/components/service_edge/src/service_edge_rpc.erl b/components/service_edge/src/service_edge_rpc.erl
index e1218b3..498c36d 100644
--- a/components/service_edge/src/service_edge_rpc.erl
+++ b/components/service_edge/src/service_edge_rpc.erl
@@ -233,9 +233,11 @@ handle_websocket(WSock, Mesg, Arg) ->
 
 %% Websocket interface
 handle_ws_json_rpc(WSock, "message", Params, _Arg ) ->
-    { ok, SvcName } = rvi_common:get_json_element(["service_name"], Params),
+    { ok, SvcName0 } = rvi_common:get_json_element(["service_name"], Params),
     { ok, Timeout } = rvi_common:get_json_element(["timeout"], Params),
-    { ok, Parameters } = rvi_common:get_json_element(["parameters"], Params),
+    { ok, Parameters0 } = rvi_common:get_json_element(["parameters"], Params),
+    SvcName = iolist_to_binary(SvcName0),
+    Parameters = parse_ws_params(Parameters0),
     LogId = log_id_json_tail(Params ++ Parameters),
     ?debug("service_edge_rpc:handle_websocket(~p) params!:      ~p", [ WSock, Params ]),
     ?debug("service_edge_rpc:handle_websocket(~p) service:      ~p", [ WSock, SvcName ]),
@@ -280,6 +282,11 @@ handle_ws_json_rpc(_Ws , "get_available_services", _Params, _Arg ) ->
 	    { services, Services},
 	    { method, <<"get_available_services">>}] }.
 
+parse_ws_params([{K, V}|T]) ->
+    [{iolist_to_binary(K), jsx:decode(iolist_to_binary(V))}
+     | parse_ws_params(T)];
+parse_ws_params([]) ->
+    [].
 
 %% Invoked by locally connected services.
 %% Will always be routed as JSON-RPC since that, and websocket,
@@ -552,7 +559,7 @@ terminate(_Reason, _St) ->
 code_change(_OldVsn, St, _Extra) ->
     {ok, St}.
 
-handle_local_message_([SvcName, TimeoutArg, Parameters | Tail], CS, St) ->
+handle_local_message_([SvcName, TimeoutArg, Parameters | _Tail], CS, St) ->
     %%
     %% Slick but ugly.
     %% If the timeout is more than 24 hrs old when parsed as unix time,
@@ -735,7 +742,6 @@ announce_service_availability(Available, SvcName) ->
       fun(#service_entry { url = URL }, Acc) ->
 	      %% If the URL is not on the blackout
 	      %% list, send a notification
-	      ?debug("  URL: ~p - Acc : ~p ", [ URL, Acc]),
 	      case lists:member(URL, Acc) of
 		  false ->
 		      ?debug("DISPATCH: ~p: ~p", [ URL, Cmd]),
@@ -751,7 +757,7 @@ announce_service_availability(Available, SvcName) ->
       end, BlockURLs, ?SERVICE_TABLE).
 
 start_log(Info, Fmt, Args, CS) ->
-    ?debug("start_log(~p,~p,~p,~p)", [Info,Fmt,Args,CS]),
+    ?debug("start_log(~p,~p,~p,CS)", [Info,Fmt,Args]),
     case rvi_common:get_json_element([<<"rvi_log_id">>], Info) of
 	{ok, ID} ->
 	    start_log_(ID, Fmt, Args, CS);
diff --git a/components/service_edge/src/wse_server.erl b/components/service_edge/src/wse_server.erl
index 3ce1598..69b4733 100644
--- a/components/service_edge/src/wse_server.erl
+++ b/components/service_edge/src/wse_server.erl
@@ -301,7 +301,7 @@ ws_loop(Buf, Socket, S) ->
 	    end;
 
 	Message ->
-	    ?debug("handle_local: ~p - ~p", [Message, S]),
+	    ?debug("handle_local: ~p", [Message]),
 	    case handle_local(Message, Socket, S) of
 		{noreply,S1} ->
 		    ws_loop(Buf, Socket, S1);