moritz/mop-skills
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(datastore): increase backend probe timeout to 3s and rebase before push

Browse Source
This commit is contained in:
Moritz Graf
2026-10-17 07:39:40 +02:00
parent 6b3fbfdbb5
commit 9f2c2c33d3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skills/datastore/scripts/datastore.py
+3 -2
View File
@@ -124,7 +124,7 @@ class DatastoreEngine:
base = self.backend_url.replace("/duckdb-api/v1", "") base = self.backend_url.replace("/duckdb-api/v1", "")
test_url = f"{base}/healthz" test_url = f"{base}/healthz"
req = urllib.request.Request(test_url, method="GET") req = urllib.request.Request(test_url, method="GET")
with urllib.request.urlopen(req, timeout=1.0) as r: with urllib.request.urlopen(req, timeout=3.0) as r:
if r.status == 200: if r.status == 200:
self.use_backend = True self.use_backend = True
logger.info(f"DatastoreEngine using single-writer backend at {self.backend_url}") logger.info(f"DatastoreEngine using single-writer backend at {self.backend_url}")
@@ -505,7 +505,8 @@ class DatastoreEngine:
subprocess.run(["git", "-C", str(repo_dir), "add", str(self.data_dir)], check=False, capture_output=True) subprocess.run(["git", "-C", str(repo_dir), "add", str(self.data_dir)], check=False, capture_output=True)
res = subprocess.run(["git", "-C", str(repo_dir), "commit", "-m", f"{commit_msg} [skip ci]"], check=False, capture_output=True) res = subprocess.run(["git", "-C", str(repo_dir), "commit", "-m", f"{commit_msg} [skip ci]"], check=False, capture_output=True)
if res.returncode == 0: if res.returncode == 0:
subprocess.run(["git", "-C", str(repo_dir), "push", "origin", "main"], check=False, capture_output=True, timeout=10) subprocess.run(["git", "-C", str(repo_dir), "pull", "--rebase", "--autostash", "origin", "main"], check=False, capture_output=True, timeout=20)
subprocess.run(["git", "-C", str(repo_dir), "push", "origin", "main"], check=False, capture_output=True, timeout=20)
except Exception as e: except Exception as e:
logger.debug(f"Git auto-sync skipped/failed: {e}") logger.debug(f"Git auto-sync skipped/failed: {e}")