summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Announcer.hs13
1 files changed, 3 insertions, 10 deletions
diff --git a/Announcer.hs b/Announcer.hs
index 0a731efa..9558e3eb 100644
--- a/Announcer.hs
+++ b/Announcer.hs
@@ -58,7 +58,6 @@ unpackAnnounceKey _ (AnnounceKey bs) = return $ Char8.unpack bs
58data ScheduledItem 58data ScheduledItem
59 = DeleteAnnouncement 59 = DeleteAnnouncement
60 | NewAnnouncement (STM (IO ())) (IO ()) (IO ()) POSIXTime 60 | NewAnnouncement (STM (IO ())) (IO ()) (IO ()) POSIXTime
61 | SearchFinished (IO ()) (IO ()) POSIXTime
62 | Announce (STM (IO ())) (IO ()) POSIXTime 61 | Announce (STM (IO ())) (IO ()) POSIXTime
63 | SearchResult (STM (IO ())) 62 | SearchResult (STM (IO ()))
64 | StopAnnouncer 63 | StopAnnouncer
@@ -73,10 +72,9 @@ data ScheduledItem
73itemStatusNum :: ScheduledItem -> Int 72itemStatusNum :: ScheduledItem -> Int
74itemStatusNum (DeleteAnnouncement ) = 0 73itemStatusNum (DeleteAnnouncement ) = 0
75itemStatusNum (NewAnnouncement {}) = 1 74itemStatusNum (NewAnnouncement {}) = 1
76itemStatusNum (SearchFinished {}) = 2 75itemStatusNum (Announce {}) = 2
77itemStatusNum (Announce {}) = 3 76itemStatusNum (SearchResult {}) = 3
78itemStatusNum (SearchResult {}) = 4 77itemStatusNum (StopAnnouncer ) = 4
79itemStatusNum (StopAnnouncer ) = 5
80itemStatusNum _ = error "itemStatusNum not in sync with ScheduledItem declaration." 78itemStatusNum _ = error "itemStatusNum not in sync with ScheduledItem declaration."
81 79
82data Announcer = Announcer 80data Announcer = Announcer
@@ -294,11 +292,6 @@ performScheduledItem announcer now = \case
294 hPutStrLn stderr $ "This print avoids negative-time future scheduling. Weird bug. TODO: fix it. "++show now 292 hPutStrLn stderr $ "This print avoids negative-time future scheduling. Weird bug. TODO: fix it. "++show now
295 announce 293 announce
296 294
297 -- search finished:
298 -- if any of the current storing-nodes set have not been
299 -- announced to, announce to them.
300 (Binding _ (SearchFinished {- st -} search announce interval) _) -> return $ Just $ return ()
301
302 (Binding _ (SearchResult action) _) -> Just <$> action 295 (Binding _ (SearchResult action) _) -> Just <$> action
303 296
304 297