Add fix indicator

domcloud · Dec 1, 2024 · 00b1e94 · 00b1e94
1 parent 92fe4f3
commit 00b1e94
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/controllers/status.js b/src/controllers/status.js
@@ -73,13 +73,13 @@ export default function () {
                 lastTestOK = lastTestResult.status == 'OK';
                 lastTest = Date.now();
             }
-            res.status(lastTestOK ? 200 : 500).json(lastTestResult);
             if (lastTestResult.codes.nginx === 1) {
                 await fixNGINX(lastTestResult);
             }
             if (lastTestResult.codes.fpms.some(x => x === 1)) {
                 await fixPHP(lastTestResult);
             }
+            res.status(lastTestOK ? 200 : 500).json(lastTestResult);
         } catch (error) {
             next(error);
         }

diff --git a/src/executor/pulse.js b/src/executor/pulse.js
@@ -1,22 +1,27 @@
 import { spawnSudoUtil } from "../util.js";
 
 export async function fixPHP(test) {
+    const edits = [];
     for (const [name, logs] of Object.entries(test.logs.fpms)) {
         const [lastLog] = logs.splice(logs.length - 1);
         if (lastLog.endsWith("ERROR: FPM initialization failed")) {
             for (const element of logs) {
                 let m = element.match(/ALERT: \[pool (\d+)\]/);
                 if (m) {
                     await spawnSudoUtil("CLEAN_DOMAIN", ["mv", m[1], ""]);
+                    edits.push(m[1]);
                 }
             }
         }
     }
+    test.fixes = test.fixes || {};
+    test.fixes.fpm = edits;
 }
 
 export async function fixNGINX(test) {
     const logs = test.logs.nginx;
     const [lastLog] = logs.splice(logs.length - 1);
+    const edits = [];
     if (lastLog == "nginx: configuration file /etc/nginx/nginx.conf test failed") {
         for (const element of logs) {
             let m = element.match(/nginx: \[emerg\] cannot load certificate \"([\w.\/]+)\"/);
@@ -28,10 +33,13 @@ export async function fixNGINX(test) {
                     let m2 = f.match(/\/etc\/nginx\/conf.d\/(.+)\.conf/);
                     if (m2) {
                         await spawnSudoUtil("CLEAN_DOMAIN", ["mv", "", m2[1]]);
+                        edits.push(m2[1]);
                     }
                 }
             }
         }
     }
+    test.fixes = test.fixes || {};
+    test.fixes.nginx = edits;
 }