voidlizard
/
hbs2
mirror of https://github.com/voidlizard/hbs2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip, log merging, debug-14

This commit is contained in:
Dmitry Zuikov 2023-07-19 14:03:05 +03:00
parent 85e72361bc
commit e1725987c9
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbs2-core/lib/HBS2/Net/Proto/Definition.hs
View File

@ -151,7 +151,7 @@ instance HasProtocol L4Proto (RefChanRequest L4Proto) where
-- мы не можем рассылать одинаковые сообщения никогда,
-- ну или хотя бы не чаще, чем раз в 10 минут.
-- но poll у нас в минутах, и с минимальным периодом 1 минута
requestPeriodLim = ReqLimPerMessage 60
requestPeriodLim = ReqLimPerMessage 1
instance Expires (SessionKey L4Proto (BlockInfo L4Proto)) where
expiresIn _ = Just defCookieTimeoutSec

11
hbs2-peer/app/RefChan.hs
View File

@ -442,14 +442,8 @@ logMergeProcess _ q = do
current <- lift $ readLog sto (HashRef h) <&> HashSet.fromList
forM_ current $ \t -> do
debug $ "FUCKING CURRENT" <+> pretty t
-- trans <- filter (not . flip HashSet.member current) . mconcat <$> mapM (lift . readLog sto) logs
trans <- mconcat <$> mapM (lift . readLog sto) logs
forM_ trans $ \t -> do
debug $ "FUCKING TRANS" <+> pretty t
trans <- filter (not . flip HashSet.member current) . mconcat <$> mapM (lift . readLog sto) logs
-- trans <- mconcat <$> mapM (lift . readLog sto) logs
guard (not $ List.null trans)
@ -522,3 +516,4 @@ logMergeProcess _ q = do
updateRef sto chanKey nref