mirror of
				https://github.com/NodeBB/NodeBB.git
				synced 2025-10-31 11:05:54 +01:00 
			
		
		
		
	updated loader to kickstart the web installer if no config is found
This commit is contained in:
		
							
								
								
									
										59
									
								
								loader.js
									
									
									
									
									
								
							
							
						
						
									
										59
									
								
								loader.js
									
									
									
									
									
								
							| @@ -246,31 +246,38 @@ nconf.argv().env().file({ | ||||
| 	file: path.join(__dirname, '/config.json') | ||||
| }); | ||||
|  | ||||
| if (nconf.get('daemon') !== false) { | ||||
| 	if (fs.existsSync(pidFilePath)) { | ||||
| 		try { | ||||
| 			var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' }); | ||||
| 			process.kill(pid, 0); | ||||
| 			process.exit(); | ||||
| 		} catch (e) { | ||||
| 			fs.unlinkSync(pidFilePath); | ||||
| fs.open(path.join(__dirname, 'config.json'), 'r', function(err) { | ||||
| 	if (!err) { | ||||
| 		if (nconf.get('daemon') !== false) { | ||||
| 			if (fs.existsSync(pidFilePath)) { | ||||
| 				try { | ||||
| 					var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' }); | ||||
| 					process.kill(pid, 0); | ||||
| 					process.exit(); | ||||
| 				} catch (e) { | ||||
| 					fs.unlinkSync(pidFilePath); | ||||
| 				} | ||||
| 			} | ||||
|  | ||||
| 			require('daemon')({ | ||||
| 				stdout: process.stdout, | ||||
| 				stderr: process.stderr | ||||
| 			}); | ||||
|  | ||||
| 			fs.writeFile(__dirname + '/pidfile', process.pid); | ||||
| 		} | ||||
|  | ||||
| 		async.series([ | ||||
| 			Loader.init, | ||||
| 			Loader.displayStartupMessages, | ||||
| 			Loader.start | ||||
| 		], function(err) { | ||||
| 			if (err) { | ||||
| 				console.log('[loader] Error during startup: ' + err.message); | ||||
| 			} | ||||
| 		}); | ||||
| 	} else { | ||||
| 		// No config detected, kickstart web installer | ||||
| 		var child = require('child_process').fork('app'); | ||||
| 	} | ||||
|  | ||||
| 	require('daemon')({ | ||||
| 		stdout: process.stdout, | ||||
| 		stderr: process.stderr | ||||
| 	}); | ||||
|  | ||||
| 	fs.writeFile(__dirname + '/pidfile', process.pid); | ||||
| } | ||||
|  | ||||
| async.series([ | ||||
| 	Loader.init, | ||||
| 	Loader.displayStartupMessages, | ||||
| 	Loader.start | ||||
| ], function(err) { | ||||
| 	if (err) { | ||||
| 		console.log('[loader] Error during startup: ' + err.message); | ||||
| 	} | ||||
| }); | ||||
| }); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user