fix nginx start/dep updates/merge upstream

Signed-off-by: Zoey <[email protected]>
ZoeyVid · Oct 22, 2024 · fd5f352 · fd5f352
1 parent 676f724
commit fd5f352
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/backend/internal/nginx.js b/backend/internal/nginx.js
@@ -100,7 +100,13 @@ const internalNginx = {
 					}
 				})
 				.catch(() => {
-					/* do nothing */
+					if (fs.existsSync('/usr/local/nginx/logs/nginx.pid') && fs.readFileSync('/usr/local/nginx/logs/nginx.pid', 'utf8').trim().length > 0) {
+						logger.info('Reloading Nginx');
+						return utils.execFile('nginx', ['-s', 'reload']);
+					} else {
+						logger.info('Starting Nginx');
+						return utils.execfg('nginx', ['-e', 'stderr']);
+					}
 				});
 		});
 	},

diff --git a/backend/package.json b/backend/package.json
@@ -10,7 +10,7 @@
     "archiver": "7.0.1",
     "batchflow": "0.4.0",
     "bcrypt": "5.1.1",
-    "better-sqlite3": "11.4.0",
+    "better-sqlite3": "11.5.0",
     "body-parser": "2.0.1",
     "compression": "1.7.4",
     "express": "4.21.1",