~singpolyma/cheogram

6722a168057276189e55356334127308d7150df1 — Stephen Paul Weber 8 years ago c4e2d13
Better error recovery
1 files changed, 6 insertions(+), 13 deletions(-)

M Main.hs
M Main.hs => Main.hs +6 -13
@@ 451,13 451,11 @@ component db toVitelity toComponent componentHost = do
		stanza <- liftIO $ atomically $ readTChan toComponent
		putStanza stanza

	forever $ do
	flip catchError (\e -> liftIO (print e >> killThread thread)) $ forever $ do
		s <- getStanza
		liftIO $ componentStanza db toVitelity toComponent componentHost s
		liftIO $ storePresence db s

	liftIO $ killThread thread

telToVitelity tel
	| not $ all isDigit $ T.unpack tel = Nothing
	| T.length tel == 10 = parseJID (tel <> fromString "@sms")


@@ 683,7 681,7 @@ viteltiy db chunks toVitelity toComponent componentHost conferenceServers = do
		putStanza stanza
		liftIO $ threadDelay wait

	forever $ do
	flip catchError (\e -> liftIO (print e >> killThread thread)) $ forever $ do
		m <- getMessage <$> getStanza
		liftIO $ case (strNode <$> (jidNode =<< messageFrom =<< m), getBody "jabber:client" =<< m) of
			(Just tel, Just txt) ->


@@ 692,8 690,6 @@ viteltiy db chunks toVitelity toComponent componentHost conferenceServers = do
					Right chunk -> atomically $ writeTChan chunks chunk
			_ -> return ()

	liftIO $ killThread thread

data Chunk = Chunk Text Int Int Text | TimerExpire

chunkParser tel =


@@ 746,12 742,9 @@ main = do
	void $ forkIO $ forever $ threadDelay 1500000 >> atomically (writeTChan chunks TimerExpire)
	void $ forkIO $ multipartStitcher db chunks toVitelity toComponent name conferences

	void $ forkIO $ void $
		forever $ flip catchError (liftIO . fmap Right . print) $
		runComponent (Server (fromString name) host (PortNumber $ fromIntegral (read port :: Int))) (fromString secret) (component db toVitelity toComponent name)
	void $ forkIO $ forever $ print =<< runComponent (Server (fromString name) host (PortNumber $ fromIntegral (read port :: Int))) (fromString secret) (component db toVitelity toComponent name)

	let Just vitelityParsedJid = parseJID $ fromString vitelityJid
	forever $ flip catchError (liftIO . fmap Right . print) $
		runClient (Server (fromString "s.ms") "s.ms" (PortNumber 5222)) vitelityParsedJid (fromMaybe mempty $ strNode <$> jidNode vitelityParsedJid) (fromString vitelityPassword) $ do
			void $ bindJID vitelityParsedJid
			viteltiy db chunks toVitelity toComponent name conferences
	forever $ runClient (Server (fromString "s.ms") "s.ms" (PortNumber 5222)) vitelityParsedJid (fromMaybe mempty $ strNode <$> jidNode vitelityParsedJid) (fromString vitelityPassword) $ do
		void $ bindJID vitelityParsedJid
		viteltiy db chunks toVitelity toComponent name conferences