From e1725987c9132811079cbf94c97ce422ac42a833 Mon Sep 17 00:00:00 2001 From: Dmitry Zuikov Date: Wed, 19 Jul 2023 14:03:05 +0300 Subject: [PATCH] wip, log merging, debug-14 --- hbs2-core/lib/HBS2/Net/Proto/Definition.hs | 2 +- hbs2-peer/app/RefChan.hs | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/hbs2-core/lib/HBS2/Net/Proto/Definition.hs b/hbs2-core/lib/HBS2/Net/Proto/Definition.hs index 7fd02c68..bb313ddf 100644 --- a/hbs2-core/lib/HBS2/Net/Proto/Definition.hs +++ b/hbs2-core/lib/HBS2/Net/Proto/Definition.hs @@ -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 diff --git a/hbs2-peer/app/RefChan.hs b/hbs2-peer/app/RefChan.hs index c3f52908..c9a9d7db 100644 --- a/hbs2-peer/app/RefChan.hs +++ b/hbs2-peer/app/RefChan.hs @@ -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 +