3 files changed, 13 insertions, 6 deletions

diff --git a/Presence/LockedChan.hs b/Presence/LockedChan.hs
index a562bc58..eac2b5ad 100644
--- a/Presence/LockedChan.hs
+++ b/Presence/LockedChan.hs
@@ -51,9 +51,10 @@ cloneLChan c = do
                     l2 <- newTVar True
                     return $ LockedChan l2 c2
             else return Nothing
-    return $ maybe (error "Attempt to clone unlocked channel")
-                   id
-                   mchan
+    maybe (do putStrLn "LockedChan: Attempt to clone unlocked channel"
+              error "Attempt to clone unlocked channel")
+          return
+          mchan
 
 #if MIN_VERSION_stm(2,4,0)
 #else
diff --git a/Presence/Server.hs b/Presence/Server.hs
index 87644946..24cd5bce 100644
--- a/Presence/Server.hs
+++ b/Presence/Server.hs
@@ -524,6 +524,9 @@ newConnection server params conkey u h inout = do
         let utc' = formatTime defaultTimeLocale "%s" utc
         warn $ "TIMEOUT " <> bshow utc' <> " " <> bshow (pingIdle me, pingTimeOut me)
         -}
+        utc <- getCurrentTime
+        let utc' = formatTime defaultTimeLocale "%s" utc
+        warn $ "ping:TIMEOUT " <> bshow utc'
         atomically (connClose newCon)
         eof
 
@@ -534,6 +537,9 @@ newConnection server params conkey u h inout = do
         let utc' = formatTime defaultTimeLocale "%s" utc
         warn $ "IDLE" <> bshow utc' <> " " <> bshow (pingIdle me, pingTimeOut me)
         -}
+        utc <- getCurrentTime
+        let utc' = formatTime defaultTimeLocale "%s" utc
+        warn $ "ping:IDLE " <> bshow utc'
         atomically $ announce ((conkey,u),RequiresPing)
         handleEOF conkey u mvar newCon
 
diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index b895597f..1d527246 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -1186,13 +1186,13 @@ forkConnection sv xmpp k laddr pingflag src snk stanzas = do
                     let from = me -- Look it up from Server object
                                   -- or pass it with Connection event.
                         mid = Just "ping"
-                        ping = makePing namespace mid to from
-                    ping <- atomically $ wrapStanzaList ping
+                        ping0 = makePing namespace mid to from
+                    ping <- atomically $ wrapStanzaList ping0
                     mapM_ (atomically . Slotted.push slots (Just $ PingSlot))
                           ping
 #ifdef PINGNOISE
                     wlog ""
-                    CL.sourceList ping $$ prettyPrint $ case k of
+                    CL.sourceList ping0 $$ prettyPrint $ case k of
                         ClientKey {} -> "C<-Ping"
                         PeerKey {} -> "P<-Ping "
 #endif