greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

reset *sync-entered when sync stopped

pull/7227/head
Tienson Qin 2022-11-05 04:44:27 +08:00
parent 564926418f
commit 4065ed353e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/frontend/components/file_sync.cljs
View File

@ -376,9 +376,7 @@
(second @graphs-txid)
(fs-sync/graph-sync-off? (second @graphs-txid))
(async/<! (fs-sync/<check-remote-graph-exists (second @graphs-txid))))
(do
(prn "sync start")
(fs-sync/sync-start))
(fs-sync/sync-start)
;; remote graph already has been deleted, clear repos first, then create-remote-graph
synced-file-graph? ; <check-remote-graph-exists -> false

7
src/main/frontend/fs/sync.cljs
View File

@ -2929,6 +2929,9 @@
(reset! current-sm-graph-uuid graph-uuid)
(sync-manager user-uuid graph-uuid base-path repo txid *sync-state)))
;; Avoid sync reentrancy
(defonce *sync-entered? (atom false))
(defn <sync-stop []
(go
(when-let [sm ^SyncManager (state/get-file-sync-manager (state/get-current-file-sync-graph-uuid))]
@ -2938,6 +2941,8 @@
(<! (-stop! sm))
(reset! *sync-entered? false)
(println "[SyncManager" (:graph-uuid sm) "]" "stopped"))
(reset! current-sm-graph-uuid nil)))
@ -2996,8 +3001,6 @@
(declare network-online-cursor)
;; Avoid reentrancy
(defonce *sync-entered? (atom false))
(defn sync-start
[]
(when (false? @*sync-entered?)