diff options
author | jim@bo <jim@bo> | 2018-06-20 22:40:37 -0400 |
---|---|---|
committer | jim@bo <jim@bo> | 2018-06-20 22:43:47 -0400 |
commit | 825962518c6ad00279fc23e8e1dec746980e483f (patch) | |
tree | 68c135bdffd879835c48cce3d397e8edf99b53f4 /Presence/XMPPServer.hs | |
parent | 09aa079fbab069f177e08b5239bf684d312eb00a (diff) |
More DPut stuff
* verbose/quiet without args shows report
* verbose all - sets all tags verbose
* quiet all - sets all tags quiet
* XMisc defaults to verbose, everything else quiet
* new XMan tag for ToxManager related stuff
* s/hputStrLn stderr/dput XMisc/ in daemon code
Diffstat (limited to 'Presence/XMPPServer.hs')
-rw-r--r-- | Presence/XMPPServer.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs index 936b2137..c73146fd 100644 --- a/Presence/XMPPServer.hs +++ b/Presence/XMPPServer.hs | |||
@@ -926,7 +926,7 @@ xmppInbound sv xmpp k laddr pingflag stanzas output donevar = doNestingXML $ do | |||
926 | when (begindoc==EventBeginDocument) $ do | 926 | when (begindoc==EventBeginDocument) $ do |
927 | whenJust nextElement $ \xml -> do | 927 | whenJust nextElement $ \xml -> do |
928 | withJust (elementAttrs "stream" xml) $ \stream_attrs -> do | 928 | withJust (elementAttrs "stream" xml) $ \stream_attrs -> do |
929 | -- liftIO $ hPutStrLn stderr $ "STREAM ATTRS "++show stream_attrs | 929 | -- liftIO $ dput XMisc $ "STREAM ATTRS "++show stream_attrs |
930 | let stream_name = lookupAttrib "to" stream_attrs | 930 | let stream_name = lookupAttrib "to" stream_attrs |
931 | -- xmpp_version = lookupAttrib "version" stream_attrs | 931 | -- xmpp_version = lookupAttrib "version" stream_attrs |
932 | fix $ \loop -> do | 932 | fix $ \loop -> do |
@@ -1866,10 +1866,10 @@ xmppServer allocate xmpp = do | |||
1866 | forkIO $ do | 1866 | forkIO $ do |
1867 | myThreadId >>= flip labelThread ("XMPP.monitor") | 1867 | myThreadId >>= flip labelThread ("XMPP.monitor") |
1868 | monitor sv peer_params xmpp | 1868 | monitor sv peer_params xmpp |
1869 | hPutStrLn stderr $ "Starting peer listen" | 1869 | dput XMisc $ "Starting peer listen" |
1870 | peer_bind <- maybe (getBindAddress "5269" True) return $ xmppPeerBind xmpp | 1870 | peer_bind <- maybe (getBindAddress "5269" True) return $ xmppPeerBind xmpp |
1871 | control sv (Listen peer_bind peer_params) | 1871 | control sv (Listen peer_bind peer_params) |
1872 | hPutStrLn stderr $ "Starting client listen" | 1872 | dput XMisc $ "Starting client listen" |
1873 | client_bind <- maybe (getBindAddress "5222" True) return $ xmppClientBind xmpp | 1873 | client_bind <- maybe (getBindAddress "5222" True) return $ xmppClientBind xmpp |
1874 | control sv (Listen client_bind client_params) | 1874 | control sv (Listen client_bind client_params) |
1875 | return XMPPServer { _xmpp_sv = sv, _xmpp_peer_params = peer_params } | 1875 | return XMPPServer { _xmpp_sv = sv, _xmpp_peer_params = peer_params } |