mirror of
				https://github.com/KevinMidboe/zoff.git
				synced 2025-10-29 18:00:23 +00:00 
			
		
		
		
	Better nice-fail if files are missing, and more correctly start non-clustered run
This commit is contained in:
		| @@ -18,7 +18,7 @@ try { | ||||
|     client.on("error", function (err) { | ||||
|         console.log("Couldn't connect to redis-server, assuming non-clustered run"); | ||||
|         num_processes = 1; | ||||
|         startClustered(false); | ||||
|         startSingle(false, false); | ||||
|         client.quit(); | ||||
|     }); | ||||
|     client.on("connect", function() { | ||||
| @@ -28,7 +28,7 @@ try { | ||||
| } catch(e) { | ||||
|     console.log("Couldn't connect to redis-server, assuming non-clustered run"); | ||||
|     num_processes = 1; | ||||
|     startClustered(false); | ||||
|     startSingle(false, false); | ||||
| } | ||||
|  | ||||
| function startClustered(redis_enabled) { | ||||
| @@ -38,6 +38,10 @@ function startClustered(redis_enabled) { | ||||
|         var spawn = function(i) { | ||||
|             workers[i] = cluster.fork(); | ||||
|             workers[i].on('exit', function(code, signal) { | ||||
|                 if(code == 1) { | ||||
|                     process.exit(1); | ||||
|                     return; | ||||
|                 } | ||||
|                 console.log('respawning worker', i); | ||||
|                 spawn(i); | ||||
|             }); | ||||
|   | ||||
| @@ -4,7 +4,7 @@ try { | ||||
| } catch(e) { | ||||
|     console.log("Error - missing file"); | ||||
|     console.log("Seems you forgot to create the file mongo_config.js in /server/config/. Have a look at mongo_config.example.js."); | ||||
|     process.exit(); | ||||
|     process.exit(1); | ||||
| } | ||||
| var mongojs = require('mongojs'); | ||||
| var db = mongojs('mongodb://' + mongo_config.host + '/' + mongo_config.config); | ||||
|   | ||||
| @@ -4,7 +4,7 @@ try { | ||||
| } catch(e) { | ||||
|     console.log("Error - missing file"); | ||||
|     console.log("Seems you forgot to create the file mongo_config.js in /server/config/. Have a look at mongo_config.example.js."); | ||||
|     process.exit(); | ||||
|     process.exit(1); | ||||
| } | ||||
| var mongojs = require('mongojs'); | ||||
| var connected_db = mongojs('mongodb://' + mongo_config.host + '/user_credentials'); | ||||
|   | ||||
| @@ -6,7 +6,7 @@ try { | ||||
| } catch(e) { | ||||
|     console.log("Error - missing file"); | ||||
|     console.log("Seems you forgot to create the file api_key.js in /server/config/. Have a look at api_key.example.js."); | ||||
|     process.exit(); | ||||
|     process.exit(1); | ||||
| } | ||||
| var request = require('request'); | ||||
| var db = require(pathThumbnails + '/handlers/db.js'); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user