1 files changed, 15 insertions, 4 deletions

diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index c037eb63..76275d15 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -398,6 +398,7 @@ sendModifiedStanzaToPeer stanza chan = do
 sendModifiedStanzaToClient :: Stanza -> TChan Stanza -> IO ()
 sendModifiedStanzaToClient stanza chan = do
     (echan,clsrs,quitvar) <- conduitToChan c
+    -- wlog $ "send-to-client " ++ show (stanzaId stanza)
     ioWriteChan chan
         stanza  { stanzaChan = echan
                 , stanzaClosers = clsrs
@@ -680,7 +681,7 @@ findErrorTag ns = do
             -> do
                  mtag <- findConditionTag
                  return $ do
-                    tag <- mtag
+                    tag <- {- trace ("mtag = "++show mtag) -} mtag
                     let t = nameLocalName (tagName tag)
                     conditionFromText t
         _ -> findErrorTag ns
@@ -1120,6 +1121,8 @@ forkConnection sv xmpp k laddr pingflag src snk stanzas = do
 #else
                     let notping f = f
 #endif
+                    -- isempty <- atomically $ isEmptyTChan (stanzaChan stanza)
+                    -- kwlog $ "queuing: "++show (isempty, stanzaId stanza)
                     notping $ do
                         dup <- atomically $ cloneStanza stanza
                         let typ = Strict8.pack $ c ++ "<-"++(concat . take 1 . words $ show (stanzaType dup))++" "
@@ -1128,6 +1131,7 @@ forkConnection sv xmpp k laddr pingflag src snk stanzas = do
                                     PeerKey {}   -> "P"
                         wlog ""
                         stanzaToConduit dup $$ prettyPrint typ
+                    -- wlog $ "hacks: "++show (stanzaId stanza)
                     case stanzaType stanza of
                         InternalEnableHack hack -> do
                             -- wlog $ "enable hack: " ++ show hack
@@ -1155,8 +1159,8 @@ forkConnection sv xmpp k laddr pingflag src snk stanzas = do
                             CL.sourceList sim =$= wrapStanzaConduit stanza -- not quite right, but whatever
                                 $$ awaitForever
                                     $ liftIO . atomically . Slotted.push slots Nothing
-                        Error {} -> do
-                            wlog $ "no hacks for error: " ++ show (stanzaType stanza)
+                        Error e _ -> do
+                            wlog $ "no hacks for error: " ++ show e
                         _ -> return ()
                     loop
                 ,do pingflag >>= check
@@ -1470,9 +1474,13 @@ monitor sv params xmpp = do
             _ -> return ()
       , readTChan stanzas >>= \stanza -> return $ do
         dup <- case stanzaType stanza of
+                -- Must dup anything that is going to be delivered...
                 Message {} -> do
                     dup <- atomically $ cloneStanza stanza -- dupped so we can make debug print
                     return dup
+                Error {} -> do
+                    dup <- atomically $ cloneStanza stanza -- dupped so we can make debug print
+                    return dup
                 _ -> return stanza
         forkIO $ do
             case stanzaOrigin stanza of
@@ -1552,7 +1560,10 @@ monitor sv params xmpp = do
                 Error {} -> do
                   case stanzaOrigin stanza of
                     LocalPeer {} -> return ()
-                    NetworkOrigin _ replyto -> deliver replyto
+                    NetworkOrigin k replyto -> do
+                         -- wlog $ "delivering error: " ++show (stanzaId stanza)
+                         -- wlog $ " from: " ++ show k
+                         deliver replyto
                 _ -> return ()
         -- We need to clone in the case the stanza is passed on as for Message.
 #ifndef PINGNOISE