Change print statements to log statements

1 files changed, 19 insertions, 18 deletions

diff --git a/src/midi.clj b/src/midi.clj
index bb9ffbc..e330876 100644
--- a/src/midi.clj
+++ b/src/midi.clj
@@ -1,5 +1,6 @@
 (ns midi
-  (:require [missionary.core :as m])
+  (:require [missionary.core :as m]
+            [taoensso.trove :as log])
   (:import [javax.sound.midi MidiSystem Receiver ShortMessage MidiDevice$Info MidiDevice Transmitter MidiMessage]
            [uk.co.xfactorylibrarians.coremidi4j CoreMidiDeviceProvider]))
 
@@ -26,15 +27,15 @@
   (m/sp
    (try
      (m/? (m/via m/blk (.open device)))
-     (println "Device opened" device)
+     (log/log! {:level :info, :id :midi/device-opened, :data {:device (str device)}})
      (m/? (tfn device))
      (finally
-       (println "Closing device...")
+       (log/log! {:level :info, :id :midi/closing-device})
        ;; NOTE:
        ;; Be careful, (.close device) will wait for (.send receiver ...) to return.
        ;; This can lead to deadlocks during cancellation.
        (m/? (m/via m/blk (.close device)))
-       (println "Device closed" device)))))
+       (log/log! {:level :info, :id :midi/device-closed, :data {:device (str device)}})))))
 
 (defn with-tx
   "Feed a transmitter device (e.g. a MIDI keyboard) into a consumer `t`.
@@ -55,35 +56,35 @@
          receiver
          (reify Receiver
            (send [_this midi-message _timestamp]
-             (println "Sending message")
+             (log/log! {:level :debug, :id :midi/sending-message})
              ;; NOTE:
              ;; Be careful, (.close device) will wait for (.send receiver ...) to return.
              ;; This can lead to deadlocks during cancellation.
              ;; 
              ;; TODO: git-bug a1652f9
              (rv midi-message)
-             (println "Message sent"))
+             (log/log! {:level :debug, :id :midi/message-sent}))
            (close [_this]))]
-     (println "RX object defined:" receiver)
+     (log/log! {:level :debug, :id :midi/rx-object-defined, :data {:receiver (str receiver)}})
      (try
-       (println "Setting receiver...")
+       (log/log! {:level :debug, :id :midi/setting-receiver})
        (m/? (m/via m/blk (.setReceiver transmitter receiver)))
-       (println "Receiver set")
+       (log/log! {:level :debug, :id :midi/receiver-set})
        (m/?
         (t (m/ap
             (loop []
               (m/amb
                (do
-                 (println "tx awaiting value from device...")
+                 (log/log! {:level :debug, :id :midi/tx-awaiting-value})
                  (m/amb))
                (let [v (m/? rv)]
-                 (println "tx received value" v)
+                 (log/log! {:level :debug, :id :midi/tx-received-value, :data {:value (str v)}})
                  v)
                (recur))))))
        (finally
-         (println "Closing tx")
+         (log/log! {:level :info, :id :midi/closing-tx})
          (m/? (m/via m/blk (.close transmitter)))
-         (println "Tx closed"))))))
+         (log/log! {:level :info, :id :midi/tx-closed}))))))
 
 (def UNSCHEDULED-EVENT -1)
 
@@ -102,19 +103,19 @@
   (m/sp
    (let [^Receiver receiver
          (m/? (m/via m/blk (.getReceiver device)))]
-     (println "receiver mounted")
+     (log/log! {:level :info, :id :midi/receiver-mounted})
      (try
        (m/?
         (m/reduce {} nil
                   (m/ap
                    (let [^MidiMessage v (m/?< f)]
-                     (println "rx received value" v)
+                     (log/log! {:level :debug, :id :midi/rx-received-value, :data {:value (str v)}})
                      (m/? (m/via m/blk (.send receiver v UNSCHEDULED-EVENT)))
-                     (println ".send returned")))))
+                     (log/log! {:level :debug, :id :midi/send-returned})))))
        (finally
-         (println "Closing rx")
+         (log/log! {:level :info, :id :midi/closing-rx})
          (m/? (m/via m/blk (.close receiver)))
-         (println "rx closed"))))))
+         (log/log! {:level :info, :id :midi/rx-closed}))))))
 
 (defn echo
   [tx-device rx-device from-ch to-ch]