Merge branch 'master' into f/notifications

This commit is contained in:
Evgeny Poberezkin committed 2022-06-08 09:49:58 +01:00
commit 4220c3bdaf
5 files changed
+9 -6

No files matched your search

+2 -1
View File
@@ -32,6 +32,7 @@ import qualified Simplex.Messaging.TMap as TM
import Simplex.Messaging.Transport (ATransport)
import Simplex.Messaging.Transport.Server (loadFingerprint, loadTLSServerParams)
import System.IO (IOMode (..))
import System.Mem.Weak (Weak)
import UnliftIO.STM
data ServerConfig = ServerConfig
@@ -113,7 +114,7 @@ data ServerStats = ServerStats
fromTime :: TVar UTCTime
}
data SubscriptionThread = NoSub | SubPending | SubThread ThreadId | ProhibitSub
data SubscriptionThread = NoSub | SubPending | SubThread (Weak ThreadId) | ProhibitSub
data Sub = Sub
{ subThread :: SubscriptionThread,