Use runtime-only health checks during install

Rhys Sullivan committed 8 months ago

Commit 4eb800c1 parent e6ecdd12 files · +21 −12Browse files

Unified · Split

2 files

executor/executor.ts +11 −8
executor/install +10 −4

 async function runDoctor(args: string[]): Promise<number> {
   const verbose = args.includes("-v") || args.includes("--verbose");
-  const unknownArgs = args.filter((arg) => arg !== "-v" && arg !== "--verbose");
+  const runtimeOnly = args.includes("--runtime-only");
+  const unknownArgs = args.filter((arg) => arg !== "-v" && arg !== "--verbose" && arg !== "--runtime-only");
   if (unknownArgs.length > 0) {
     console.log(`Unknown option: ${unknownArgs[0]}`);
     return 1;
   const webRunning = await checkHttp(`http://127.0.0.1:${webPort}/`);
   let bootstrapState: Awaited<ReturnType<typeof checkBootstrapHealth>> | null = null;
-  if (backendRunning) {
+  if (backendRunning && !runtimeOnly) {
     bootstrapState = await checkBootstrapHealth(info);
   }
-  const functionsReady = bootstrapState?.state === "ready";
+  const functionsReady = runtimeOnly ? true : bootstrapState?.state === "ready";
   const healthy = nodeInstalled && webInstalled && backendRunning && webRunning && functionsReady;
   console.log(`Executor status: ${healthy ? "ready" : "needs attention"}`);
   console.log(`Dashboard: http://127.0.0.1:${webPort} (${webRunning ? "running" : "not running"})`);
   console.log(`Backend: ${backendRunning ? "running" : "not running"} (${info.convexUrl})`);
-  if (!backendRunning) {
+  if (runtimeOnly) {
+    console.log("Functions: skipped (runtime-only check)");
+  } else if (!backendRunning) {
     console.log("Functions: unavailable (backend is not running)");
   } else if (bootstrapState?.state === "ready") {
     console.log("Functions: bootstrapped");
   if (!webRunning) {
     console.log("Next step: run `executor web`");
   }
-  if (backendRunning && bootstrapState?.state === "no_project") {
+  if (!runtimeOnly && backendRunning && bootstrapState?.state === "no_project") {
     console.log("Next step: run from your repo root or set `EXECUTOR_PROJECT_DIR` to a Convex project.");
   }
-  if (backendRunning && bootstrapState?.state === "missing_functions") {
+  if (!runtimeOnly && backendRunning && bootstrapState?.state === "missing_functions") {
     console.log("Next step: run `executor up` from your project root to bootstrap functions.");
   }
-  if (backendRunning && bootstrapState?.state === "check_failed") {
+  if (!runtimeOnly && backendRunning && bootstrapState?.state === "check_failed") {
     console.log("Next step: run `executor up` and inspect ~/.executor/runtime/logs/backend.log");
   }
   if (!webInstalled || !nodeInstalled) {
     console.log(`  convex site: ${info.convexSiteUrl}`);
     console.log(`  node runtime: ${nodeInstalled ? info.nodeBin : "missing"}`);
     console.log(`  web bundle: ${webInstalled ? info.webServerEntry : "missing"}`);
-    console.log(`  functions: ${bootstrapState?.state ?? "unavailable"}`);
+    console.log(`  functions: ${runtimeOnly ? "skipped" : (bootstrapState?.state ?? "unavailable")}`);
     if (bootstrapState?.detail) {
       console.log(`  functions detail: ${bootstrapState.detail}`);
     }

executor/install+10−4

 wait_for_executor_ready() {
   local max_seconds="${1:-90}"
   local started now elapsed
-  local doctor_interval=5
+  local doctor_interval=10
   local last_doctor_at=0
   local backend_up=0
   local web_up=0
     if (( backend_up == 1 && web_up == 1 )); then
       if (( now - last_doctor_at >= doctor_interval )); then
-        if "$INSTALL_DIR/$APP" doctor >/dev/null 2>&1; then
+        if "$INSTALL_DIR/$APP" doctor --runtime-only >/dev/null 2>&1; then
           echo -e "${MUTED}Executor services healthy${NC}"
           return 0
         fi
-        last_doctor_at=$now
+        last_doctor_at="$(date +%s)"
+        now="$(date +%s)"
+        elapsed=$((now - started))
+        if (( elapsed >= max_seconds )); then
+          break
+        fi
       fi
       doctor_ok=0
     fi
       break
     fi
-    if (( elapsed > 0 && elapsed % 5 == 0 )); then
+    if (( elapsed > 0 && elapsed % 10 == 0 )); then
       if (( backend_up == 0 || web_up == 0 )); then
         local backend_state="starting"
         local web_state="starting"