kikid: Serialization...

1 files changed, 10 insertions, 5 deletions

diff --git a/kikid.hs b/kikid.hs
index 31426a3..04e06d3 100644
--- a/kikid.hs
+++ b/kikid.hs
@@ -16,8 +16,11 @@ import Control.Monad.Loops
 import Control.Exception
 import Data.Monoid
 import qualified Data.ByteString.Char8 as B
-import Data.Serialize
+--import Data.Serialize
 import qualified Data.Map as M
+import qualified Data.Bytes.Serial as Bytes
+import qualified Data.Bytes.Get as Bytes
+--import qualified Data.Bytes.Put as Bytes
 
 -- TODO: Set this in config file
 port = 9800
@@ -64,7 +67,7 @@ kikidMain _ = do
         atomically $ closeTBMQueue newchans
         atomically $ closeTBMQueue incomming
 
-data ClientState = CState {cs_queue :: TBMQueue KikiDMessage}
+data ClientState = CState {csQueue :: TBMQueue KikiDMessage}
 type ClientID = ThreadId 
 threadIdToClient = id
 
@@ -96,12 +99,14 @@ purgeClosedConnections quit currentClients = whileM_ (fmap not quit) $ do
 handleMessage hdl outq = do 
     line <- B.hGetLine hdl
     tid <- myThreadId
-    case (decode line :: Either String KikiDMessage) of
-        Right _ -> 
+    case (Bytes.runGetS Bytes.deserialize (B.snoc line '\n')   :: Either String KikiDMessage) of
+        Right msg -> do
             syslog Notice ("Message decoded on thread=" <> show tid)
+            syslog Notice ("Message: " <> show msg)
         Left str -> do
+            syslog Notice ("ERROR: " <> show line)
             syslog Notice ("ERROR: Unable to decode message on thread=" <> show tid)
-            syslog Notice str
+            syslog Notice ("ERROR: " ++ str)
 
 consumeMessage currentClients msg = void $ syslog Notice ("Recieved Message: " ++ show msg)
 -- TODO: Do more here...