Kill processes before delete domain

domcloud · Dec 13, 2023 · d56afe3 · d56afe3
1 parent 6ce58d5
commit d56afe3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "domcloud-bridge",
-  "version": "0.34.2",
+  "version": "0.34.3",
   "description": "Deployment runner for DOM Cloud",
   "main": "app.js",
   "engines": {

diff --git a/src/executor/runner.js b/src/executor/runner.js
@@ -246,9 +246,11 @@ export default async function runConfig(config, domain, writer, sandbox = false)
                             });
                             break;
                         case 'delete':
+                            const user = domaindata['Username'];
                             await writeLog("$> virtualmin delete-domain");
+                            await spawnSudoUtil('SHELL_SUDO', [user, 'killall', '-u' , user]);        
                             await virtExec("delete-domain", value, {
-                                user: domaindata['Username'],
+                                user,
                             });
                             await spawnSudoUtil('PHPFPM_CLEAN', domaindata['ID']);
                             // no need to do other stuff