Infrastructure for better logging, finally!

Right now all existing logs are logged at Info, but this will
change. This should make it significantly easier to debug
things wit log levels like Trace. I may at some point define more
log level endpoints or come up with a more expressive logging
system, but this is a good start.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/Rahm/Desktop/Keys.hs b/src/Rahm/Desktop/Keys.hs
index a453df1..c8abbf0 100644
--- a/src/Rahm/Desktop/Keys.hs
+++ b/src/Rahm/Desktop/Keys.hs
@@ -172,7 +172,7 @@ keymap = runKeys $ do
     -- things all for BS security theater, but I guess there might be some way
     -- to do this via XTest?
     shiftMod $ forAllWindows  $ \w -> do
-      logs $ "Try send to " ++ show w
+      logs Info "Try send to %s" (show w)
       sendKey (0, xK_a) w
 
     justMod $
@@ -185,7 +185,7 @@ keymap = runKeys $ do
 
     justMod $
       doc "Print this documentation." $
-      logs (documentation (keymap config))
+      (logs Info "%s" (documentation (keymap config)) :: X ())
 
   bind xK_F10 $ do
     justMod playPauseDoc
@@ -221,7 +221,7 @@ keymap = runKeys $ do
         withScreen W.shift idx
 
       altgrMod $
-        logs "Test altgr"
+        (logs Info "Test altgr" :: X ())
 
   bind xK_bracketright $ do
     justMod $
@@ -391,7 +391,7 @@ keymap = runKeys $ do
       bind xK_q $
         (justMod -|- noMod) $
           doc "EXPERIMENTAL: Move mouse to control media." $
-            mouseRotateMotion (logs "CW") (logs "CCW")
+            mouseRotateMotion (logs Info "CW") (logs Info "CCW")
 
   bind xK_r $ do
     justMod $ doc "Run a command via Rofi" runDMenu
@@ -516,7 +516,7 @@ keymap = runKeys $ do
             doc "Go to the prior window in the history" historyBack
 
         bind xK_t $ do
-          (justMod -|- noMod) $ logs "Test Log"
+          (justMod -|- noMod) $ (logs Info "Test Log" :: X ())
 
         -- bind xK_n $ do
         --   (justMod -|- noMod) $
@@ -845,7 +845,7 @@ windowSpecificBindings config = do
 
     bind xK_F2 $
       -- Experimental.
-      noMod $ logs "This is a test"
+      noMod $ (logs Info "This is a test" :: X ())
 
   -- Add a binding to xev as a test.
   configureIf (title =? "Event Tester") $
@@ -878,9 +878,9 @@ windowBindings xconfig =
       map <- execWriterT $ windowSpecificBindings xconfig
       w <- ask
 
-      liftX $ logs $ printf "For Window: %s" (show w)
+      liftX $ logs Info "For Window: %s" (show w)
       forM_ (Map.toList map) $ \(key, action) -> do
-        liftX $ logs $ printf "   -- remap: %s" (show key)
+        liftX $ logs Info "   -- remap: %s" (show key)
         remapKey key action
 
 applyKeys :: XConfig l -> IO (XConfig l)