TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-04 10:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1280 from eikek/fix/app-ids

Browse Source 
Remove pubsub entries when shutting down and initialize by uri
This commit is contained in:
mergify[bot] 2022-01-12 20:40:40 +00:00 committed by GitHub
commit c9eabd087a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/pubsub/naive/src/main/scala/docspell/pubsub/naive/NaivePubSub.scala
View File

@ -182,10 +182,12 @@ object NaivePubSub {
store: Store[F],
client: Client[F]
)(topics: NonEmptyList[Topic]): Resource[F, NaivePubSub[F]] =
Resource.eval(for {
Resource.make(for {
state <- Ref.ofEffect[F, State[F]](State.create[F](topics))
_ <- store.transact(RPubSub.initTopics(cfg.nodeId, cfg.url, topics.map(_.name)))
} yield new NaivePubSub[F](cfg, state, store, client))
} yield new NaivePubSub[F](cfg, state, store, client))(_ =>
store.transact(RPubSub.deleteTopics(cfg.nodeId)).as(())
)
def create[F[_]: Async](
cfg: PubSubConfig,

5
modules/store/src/main/scala/docspell/store/records/RPubSub.scala
View File

@ -52,7 +52,7 @@ object RPubSub {
url: LenientUri,
topics: NonEmptyList[String]
): ConnectionIO[Int] =
DML.delete(T, T.nodeId === nodeId) *>
DML.delete(T, T.nodeId === nodeId || T.url === url) *>
topics.toList
.traverse(t =>
Ident
@ -61,6 +61,9 @@ object RPubSub {
)
.map(_.sum)
def deleteTopics(nodeId: Ident): ConnectionIO[Int] =
DML.delete(T, T.nodeId === nodeId)
def increment(url: LenientUri, topics: NonEmptyList[String]): ConnectionIO[Int] =
DML.update(
T,