tiddly-gittly / TidGi-Desktop

TidGi is an privacy-in-mind, automated, auto-git-backup, freely-deployed knowledge management Desktop note app, based on Tiddlywiki, with REST API for web-clipping and Anki connect. 「 太记 」是一个基于「 太微 TiddlyWiki 」的知识管理桌面应用,能保护隐私内容、高级自动化、自动Git云备份、部署为博客,且可通过RESTAPI与Anki等应用连接。(迭代开发中欢迎试用,开发进度见下方链接)(Under active development, see website below for details)
https://tidgi.fun
Mozilla Public License 2.0
1.77k stars 111 forks source link

bug: 同步失败时不该重启服务 #558

Open linonetwo opened 6 months ago

linonetwo commented 6 months ago

Environment 环境信息

No response

Description 描述

No response

Steps to Reproduce 复现方式

{"branch":"master","callerFunction":"commitAndSync","dir":"E:\\wiki\\calendar","functionName":"commitAndSync","handler":"wiki-sync-progress","id":"hGeOuKEK725KQ_6x0uD39","level":"info","message":"本地状态落后于云端,开始合并云端数据","remoteUrl":"https://github.com/linonetwo/calendar","step":"LocalStateBehindSync","timestamp":"2024-05-08T17:01:05.416Z"}
{"callerFunction":"commitAndSync","dir":"E:\\wiki\\calendar","functionName":"mergeUpstream","handler":"wiki-sync-progress","id":"hGeOuKEK725KQ_6x0uD39","level":"info","message":"GitMerge","step":"GitMerge","timestamp":"2024-05-08T17:01:05.416Z"}
{"callerFunction":"commitAndSync","dir":"E:\\wiki\\calendar","functionName":"mergeUpstream","handler":"wiki-sync-progress","id":"hGeOuKEK725KQ_6x0uD39","level":"info","message":"GitMergeComplete","step":"GitMergeComplete","timestamp":"2024-05-08T17:01:05.530Z"}
{"callerFunction":"commitAndSync","level":"warn","message":"E-3 failed to config git to successfully pull from or push to remote with configuration {\"dir\":\"E:\\\\wiki\\\\calendar\",\"branch\":\"master\",\"remote\":\"origin\",\"userInfo\":{\"gitUserName\":\"linonetwo\",\"email\":\"linonetwo012@gmail.com\",\"accessToken\":\"ghp_dT4C82gBXQ77Vnkde...\",\"branch\":\"master\"}}.\nerrorMessages: Updating fe2e0d9..9dcf725\nerror: Unable to create 'E:/wiki/calendar/.git/index.lock': File exists.\n\nAnother git process seems to be running in this repository, e.g.\nan editor opened by 'git commit'. Please make sure all processes\nare terminated then try again. If it still fails, a git process\nmay have crashed in this repository earlier:\nremove the file manually to continue.\n GitPullPushError: E-3 failed to config git to successfully pull from or push to remote with configuration {\"dir\":\"E:\\\\wiki\\\\calendar\",\"branch\":\"master\",\"remote\":\"origin\",\"userInfo\":{\"gitUserName\":\"linonetwo\",\"email\":\"linonetwo012@gmail.com\",\"accessToken\":\"ghp_dT4C82gBXQ77Vnkde...\",\"branch\":\"master\"}}.\nerrorMessages: Updating fe2e0d9..9dcf725\nerror: Unable to create 'E:/wiki/calendar/.git/index.lock': File exists.\n\nAnother git process seems to be running in this repository, e.g.\nan editor opened by 'git commit'. Please make sure all processes\nare terminated then try again. If it still fails, a git process\nmay have crashed in this repository earlier:\nremove the file manually to continue.\n\n    at C:\\Users\\linonetwo\\AppData\\Local\\TidGi\\app-0.9.6\\resources\\app.asar.unpacked\\.webpack\\main\\722.index.worker.js:2:410042\n    at processTicksAndRejections (node:internal/process/task_queues:95:5)\n    at or (C:\\Users\\linonetwo\\AppData\\Local\\TidGi\\app-0.9.6\\resources\\app.asar.unpacked\\.webpack\\main\\722.index.worker.js:2:409806)","timestamp":"2024-05-08T17:01:05.608Z"}
{"level":"info","message":"Restarting workspace VKt1l29a3_B7BOIak-BP7","timestamp":"2024-05-08T17:01:05.609Z"}
{"level":"debug","message":"updateLastUrl() Updating lastUrl for workspace VKt1l29a3_B7BOIak-BP7 to tidgi://vkt1l29a3_b7boiak-bp7/#:%E5%9B%A0%E6%9E%9C%E7%9A%84%E5%90%AB%E4%B9%89%20%E7%94%A8RFDifussion%E5%88%86%E6%9E%90%E8%9B%8B%E7%99%BD%E7%9B%B8%E4%BA%92%E4%BD%9C%E7%94%A8%20%E5%AD%A6%E4%B9%A0%E9%AB%98%E9%80%9A%E9%87%8F%E5%9F%BA%E5%9B%A0%E5%88%86%E6%9E%90%E7%9B%B8%E5%85%B3%E6%A6%82%E5%BF%B5%20Index","timestamp":"2024-05-08T17:01:05.609Z"}

Additional Context 额外上下文

No response