improve logging

dc0d · Sep 29, 2023 · 477d4b7 · 477d4b7
1 parent af6575f
commit 477d4b7
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 23 deletions.
diff --git a/.github/workflows/fly.yml b/.github/workflows/fly.yml
@@ -2,9 +2,6 @@ name: Fly Deploy
 
 on: workflow_dispatch
 
-env:
-  FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
-
 permissions:
   contents: read
 
@@ -30,4 +27,7 @@ jobs:
       - run: mix release
 
       - uses: superfly/flyctl-actions/setup-flyctl@master
-      - run: fly deploy --ha=false
+      - run: |
+          flyctl deploy --remote-only
+        env:
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
diff --git a/lib/icb/chains/action_theme.ex b/lib/icb/chains/action_theme.ex
@@ -31,7 +31,7 @@ defmodule ICB.Chains.ActionTheme do
 
   @impl true
   def handle(update, context) do
-    Logger.warning(%{signal: :unandled_update, update: update, context: context})
+    Logger.warning(inspect(%{signal: :unandled_update, update: update, context: context}))
     {:done, context}
   end
 end
diff --git a/lib/icb/chains/ask_the_oracle.ex b/lib/icb/chains/ask_the_oracle.ex
@@ -47,7 +47,7 @@ defmodule ICB.Chains.AskTheOracle do
 
   @impl true
   def handle(update, context) do
-    Logger.warning(%{signal: :unandled_update, update: update, context: context})
+    Logger.warning(inspect(%{signal: :unandled_update, update: update, context: context}))
     {:done, context}
   end
 end
diff --git a/lib/icb/chains/ask_the_oracle_cb.ex b/lib/icb/chains/ask_the_oracle_cb.ex
@@ -20,9 +20,10 @@ defmodule ICB.Chains.AskTheOracleCallback do
           _callback_query,
         context
       ) do
-    Telegex.delete_message(chat_id, message_id)
-    |> inspect()
-    |> Logger.info()
+    case Telegex.delete_message(chat_id, message_id) do
+      {:error, error} -> error |> inspect() |> Logger.error()
+      _ -> :ok
+    end
 
     odds_text =
       data
@@ -45,21 +46,24 @@ defmodule ICB.Chains.AskTheOracleCallback do
     Task.start(fn ->
       Process.sleep(361)
 
-      Telegex.send_message(chat_id, "#{resolution} 🎲 #{odds_text}")
-      |> inspect()
-      |> Logger.info()
+      case Telegex.send_message(chat_id, "#{resolution} 🎲 #{odds_text}") do
+        {:error, error} -> error |> inspect() |> Logger.error()
+        _ -> :ok
+      end
     end)
 
     {:done, context}
   end
 
   @impl true
   def handle(callback_query, context) do
-    Logger.warning(%{
-      signal: :unandled_callback_query,
-      callback_query: callback_query,
-      context: context
-    })
+    Logger.warning(
+      inspect(%{
+        signal: :unandled_callback_query,
+        callback_query: callback_query,
+        context: context
+      })
+    )
 
     {:done, context}
   end

diff --git a/lib/icb/chains/make_npc.ex b/lib/icb/chains/make_npc.ex
@@ -32,7 +32,7 @@ defmodule ICB.Chains.MakeCharacter do
 
   @impl true
   def handle(update, context) do
-    Logger.warning(%{signal: :unandled_update, update: update, context: context})
+    Logger.warning(inspect(%{signal: :unandled_update, update: update, context: context}))
     {:done, context}
   end
 end
diff --git a/lib/icb/chains/roll.ex b/lib/icb/chains/roll.ex
@@ -43,7 +43,7 @@ defmodule ICB.Chains.Roll do
 
   @impl true
   def handle(update, context) do
-    Logger.warning(%{signal: :unandled_update, update: update, context: context})
+    Logger.warning(inspect(%{signal: :unandled_update, update: update, context: context}))
     {:done, context}
   end
 

diff --git a/lib/icb/chains/start.ex b/lib/icb/chains/start.ex
@@ -36,7 +36,7 @@ defmodule ICB.Chains.Start do
 
   @impl true
   def handle(update, context) do
-    Logger.warning(%{signal: :unandled_update, update: update, context: context})
+    Logger.warning(inspect(%{signal: :unandled_update, update: update, context: context}))
     {:done, %{}}
   end
 end
diff --git a/lib/icb/polling_handler.ex b/lib/icb/polling_handler.ex
@@ -21,6 +21,8 @@ defmodule ICB.PollingHandler do
 
   @impl true
   def on_update(update) do
+    log_update(update)
+
     ICB.Chains.Handler.call(update, %ICB.Chains.Context{bot: Telegex.Instance.me()})
   end
 
@@ -45,9 +47,46 @@ defmodule ICB.PollingHandler do
         }
       ]
 
-      Telegex.set_my_commands(commands)
-      |> inspect()
-      |> Logger.info()
+      case Telegex.set_my_commands(commands) do
+        {:error, error} -> error |> inspect() |> Logger.error()
+        _ -> :ok
+      end
     end)
   end
+
+  defp log_update(update) do
+    case update do
+      %{
+        callback_query: %{
+          data: data,
+          message: %{
+            from: %{
+              first_name: first_name,
+              last_name: last_name,
+              username: username,
+              id: id
+            },
+            text: text
+          }
+        }
+      } ->
+        Logger.info("from [#{first_name}] [#{last_name}] (@#{username}) (#{id}): #{text} #{data}")
+
+      %{
+        message: %{
+          from: %{
+            first_name: first_name,
+            last_name: last_name,
+            username: username,
+            id: id
+          },
+          text: text
+        }
+      } ->
+        Logger.info("from [#{first_name}] [#{last_name}] (@#{username}) (#{id}): #{text}")
+
+      _ ->
+        :ok
+    end
+  end
 end