clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-06-01 19:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(repo): retry when fetching encounter 401

Browse Source
This commit is contained in:
defclass
2020-11-30 11:45:02 +08:00
committed by Tienson Qin
parent 8b5719e1fd
commit 4a9fea7697
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/frontend/handler/repo.cljs
View File

@@ -276,9 +276,11 @@
(git/get-local-diffs repo-url local-latest-commit remote-latest-commit)))
(defn pull
[repo-url {:keys [force-pull? show-diff?]
[repo-url {:keys [force-pull? show-diff? try-times]
:or {force-pull? false
show-diff? false}}]
show-diff? false
try-times 2}
:as opts}]
(spec/validate :repos/url repo-url)
(when (and
(db/get-conn repo-url true)
@@ -341,13 +343,25 @@
(route-handler/redirect! {:to :diff}))
(push repo-url {:merge-push-no-diff? true
:commit-message "Merge push without diffed files"}))))))))
(p/catch (fn [error]
(println "Pull error:" (str error))
(js/console.error error)
(git-handler/set-git-status! repo-url :pull-failed)
(when (or (string/includes? (str error) "401")
(string/includes? (str error) "404"))
(show-install-error! repo-url (util/format "Failed to fetch %s." repo-url))))))))))))))
(p/catch
(fn [error]
(cond
(string/includes? (str error) "404")
(do (log/error :git/pull-error error)
(show-install-error! repo-url (util/format "Failed to fetch %s." repo-url)))
(string/includes? (str error) "401")
(let [remain-times (dec try-times)]
(if (> remain-times 0)
(let [new-opts (merge opts {:try-times remain-times})]
(pull repo-url new-opts))
(let [error-msg
(util/format "Failed to fetch %s. It may be caused by token expiration or missing." repo-url)]
(log/error :git/pull-error error)
(notification/show! error-msg :error false))))
:else
(log/error :git/pull-error error)))))))))))))
(defn push
[repo-url {:keys [commit-message merge-push-no-diff?]