From 12d9b7a21d54b5bfba892ab970cb16387ca09a29 Mon Sep 17 00:00:00 2001
From: macpie <macpie@users.noreply.github.com>
Date: Wed, 1 Mar 2023 14:25:43 -0800
Subject: [PATCH] Macpie/eui fixes (#917)

* Fix logs and and ws event

* Better log line
---
 config/sys.config                     |  8 ++++++++
 config/sys.config.src                 |  8 ++++++++
 src/apis/router_console_ws_worker.erl |  2 +-
 src/grpc/router_ics_eui_worker.erl    | 12 +++++++++++-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/config/sys.config b/config/sys.config
index 51341a378..8a6614d4b 100644
--- a/config/sys.config
+++ b/config/sys.config
@@ -120,6 +120,14 @@
             {{lager_file_backend, "router.log"}, [{application, router}], info},
             {{lager_file_backend, "router.log"}, [{module, router_console_api}], info},
             {{lager_file_backend, "router.log"}, [{module, router_device_routing}], info},
+
+            {{lager_file_backend, "router.log"}, [{module, helium_packet_service}], info},
+            {{lager_file_backend, "router.log"}, [{module, helium_router_service}], info},
+            {{lager_file_backend, "router.log"}, [{module, router_ics_eui_worker}], info},
+            {{lager_file_backend, "router.log"}, [{module, router_ics_route_get_euis_handler}], info},
+            {{lager_file_backend, "router.log"}, [{module, router_ics_skf_list_handler}], info},
+            {{lager_file_backend, "router.log"}, [{module, router_ics_skf_worker}], info},
+
             {{lager_file_backend, "state_channel.log"}, [{module, router_sc_worker}], info},
             {
                 {lager_file_backend, "state_channel.log"},
diff --git a/config/sys.config.src b/config/sys.config.src
index c3a2460d9..a6f4c137b 100644
--- a/config/sys.config.src
+++ b/config/sys.config.src
@@ -137,6 +137,14 @@
             {{lager_file_backend, "router.log"}, [{application, router}], info},
             {{lager_file_backend, "router.log"}, [{module, router_console_api}], info},
             {{lager_file_backend, "router.log"}, [{module, router_device_routing}], info},
+
+            {{lager_file_backend, "router.log"}, [{module, helium_packet_service}], info},
+            {{lager_file_backend, "router.log"}, [{module, helium_router_service}], info},
+            {{lager_file_backend, "router.log"}, [{module, router_ics_eui_worker}], info},
+            {{lager_file_backend, "router.log"}, [{module, router_ics_route_get_euis_handler}], info},
+            {{lager_file_backend, "router.log"}, [{module, router_ics_skf_list_handler}], info},
+            {{lager_file_backend, "router.log"}, [{module, router_ics_skf_worker}], info},
+
             {{lager_file_backend, "state_channel.log"}, [{module, router_sc_worker}], info},
             {
                 {lager_file_backend, "state_channel.log"},
diff --git a/src/apis/router_console_ws_worker.erl b/src/apis/router_console_ws_worker.erl
index 0c3b27da9..09c3c2f24 100644
--- a/src/apis/router_console_ws_worker.erl
+++ b/src/apis/router_console_ws_worker.erl
@@ -168,7 +168,7 @@ handle_info(
     {noreply, State};
 %% Device remove
 handle_info(
-    {ws_message, <<"device:all">>, <<"device:all:remove:devices">>, #{<<"devices">> := DeviceIDs}},
+    {ws_message, <<"device:all">>, <<"device:all:delete:devices">>, #{<<"devices">> := DeviceIDs}},
     #state{db = DB, cf = CF} = State
 ) ->
     catch router_ics_eui_worker:remove(DeviceIDs),
diff --git a/src/grpc/router_ics_eui_worker.erl b/src/grpc/router_ics_eui_worker.erl
index 53f83466a..3875e1cf1 100644
--- a/src/grpc/router_ics_eui_worker.erl
+++ b/src/grpc/router_ics_eui_worker.erl
@@ -345,7 +345,17 @@ update_euis(List, State) ->
                 fun({Action, EUIPairs}) ->
                     lists:foreach(
                         fun(EUIPair) ->
-                            lager:info("~p ~p", [Action, EUIPair]),
+                            lager:info("~p app_eui=~s (~w) dev_eui=~s (~w)", [
+                                Action,
+                                lorawan_utils:binary_to_hex(<<
+                                    (EUIPair#iot_config_eui_pair_v1_pb.app_eui):64/integer-unsigned-big
+                                >>),
+                                EUIPair#iot_config_eui_pair_v1_pb.app_eui,
+                                lorawan_utils:binary_to_hex(<<
+                                    (EUIPair#iot_config_eui_pair_v1_pb.dev_eui):64/integer-unsigned-big
+                                >>),
+                                EUIPair#iot_config_eui_pair_v1_pb.dev_eui
+                            ]),
                             ok = update_euis(Action, EUIPair, Stream, State)
                         end,
                         EUIPairs