Cluster only with -c, ignoring openshift, and adding env vars for clo…

…udfoundry

.gitignore

@@ -1 +1,2 @@
-node_modules
+node_modules
+.openshift

app.js

@@ -1,43 +1,36 @@
 // Express sample aritmetic application.
-var	url 	= require("url"),
-	express = require("express"),
+var	express = require("express"),
 	operacionsAritmetiques = require("./operacionsAritmetiques"),
 	args = require("commander"),
 	cluster = require("cluster");
 
-var ipaddr  = process.env.OPENSHIFT_INTERNAL_IP || "192.168.7.163",
-		port    = process.env.OPENSHIFT_INTERNAL_PORT ;//|| "8080";
-
-var app = express(),
+var port = process.env.OPENSHIFT_INTERNAL_PORT || process.env.VMC_APP_PORT || "8080",
+	app = express(),
 	handle = {};
-
+ 
 args
 	.version('0.1')
 	//.option('-p, --port [number]', 'client port', 8080)
 	.option('-f, --folder [folderpath]', 'root folder path', './' )
 	.option('-c, --cluster', 'cluster of processes')
 	.parse(process.argv);
 
-/*if(cluster.isMaster) {
+
 	//console.log('Binding to port ', args.port);
 	console.log('Folder path: ', args.folder);
 	console.log('Processor: ' + require('os').cpus()[0].model);
 
-	if(args.cluster) {
-		console.log('Cluster: ' + args.cluster);
-		require('os').cpus().forEach(function (item) {
-			cluster.fork();
-		});
-	} else {
-		console.log('Cluster: no cluster');
+if(args.cluster && cluster.isMaster) {
+	console.log('Cluster: ' + args.cluster);
+	require('os').cpus().forEach(function (item) {
 		cluster.fork();
-	}
-} else {*/
-
+	});
+} else {
 	app.configure(function (){
 		app.use(express.bodyParser());
 	});
-
+
+	// Handlers for POST.
 	app.post("/sumar", function(request, response){operacionsAritmetiques.sumar(request.body.op1, request.body.op2, function(error, resultat){
 						if(error){
 							response.json(error.errorCode, { error: error.errorDescription });
@@ -70,8 +63,21 @@ args
 						}
 	});});
 
+	// Handlers for GET
 	app.get("/:operation", function (request, response, next){
-		var op = handle[request.params.operation];
+		var op;
+
+		if(request.params.operation == "sumar"){
+			op = operacionsAritmetiques.sumar;
+		}else if(request.params.operation == "restar"){
+			op = operacionsAritmetiques.restar;
+		}else if(request.params.operation == "multiplicar"){
+			op = operacionsAritmetiques.multiplicar;
+		}else if(request.params.operation == "dividir"){
+			op = operacionsAritmetiques.dividir;
+		}else{
+			op = undefined;
+		}
 
 		if(typeof op === 'function'){
 			op( parseInt(request.param('op1')),
@@ -88,10 +94,11 @@ args
 		}
 	});
 
+	// Default handler
 	app.all("/*", function (request, response){
 		response.json(404, {error:'404 Not Found'});
 	});
 
-	app.listen(port,ipaddr);//args.port,ipaddr);
-	console.log("Server has started at: "+ipaddr+":"+port);
-//}
+	app.listen(port);
+	console.log("Server has started at port: "+port);
+}

package.json

@@ -3,7 +3,6 @@
   "version": "0.0.3",
   "description": "Aritmetic Sample Application",
   "keywords": [
-    "OpenShift",
     "Node.js",
     "application",
     "openshift",
@@ -28,7 +27,7 @@
   "bundleDependencies": [],
 
   "scripts": {  
-     "start": "node ./app.js -c"
+     "start": "node ./app.js"
   },
   "private": true