Browse Source

Further param parsing cleanup

Edward Bramanti 10 years ago
parent
commit
5c0345484b
1 changed files with 1 additions and 23 deletions
  1. 1 23
      frameworks/JavaScript/nodejs/hello.js

+ 1 - 23
frameworks/JavaScript/nodejs/hello.js

@@ -175,13 +175,11 @@ if(cluster.isMaster) {
     }
     }
     var values = url.parse(req.url, true);
     var values = url.parse(req.url, true);
     var queries = isNaN(values.query.queries) ? 1 : parseInt(values.query.queries, 10);
     var queries = isNaN(values.query.queries) ? 1 : parseInt(values.query.queries, 10);
+    queries = Math.min(Math.max(queries, 1), 500);
     switch (values.pathname) {
     switch (values.pathname) {
       // Raw MongoDB Routes
       // Raw MongoDB Routes
       case '/mongodb':
       case '/mongodb':
         var queryFunctions = [];
         var queryFunctions = [];
-
-        queries = Math.min(Math.max(queries, 1), 500);
-
         for (var i = 0; i < queries; i += 1) {
         for (var i = 0; i < queries; i += 1) {
           queryFunctions.push(mongodbDriverQuery);
           queryFunctions.push(mongodbDriverQuery);
         }
         }
@@ -200,9 +198,6 @@ if(cluster.isMaster) {
 
 
       case '/mongodb-update':
       case '/mongodb-update':
         var queryFunctions = [];
         var queryFunctions = [];
-
-        queries = Math.min(Math.max(queries, 1), 500);
-
         for (var i = 0; i < queries; i += 1) {
         for (var i = 0; i < queries; i += 1) {
           queryFunctions.push(mongodbDriverUpdateQuery);
           queryFunctions.push(mongodbDriverUpdateQuery);
         }
         }
@@ -219,9 +214,6 @@ if(cluster.isMaster) {
       // Mongoose ORM Routes
       // Mongoose ORM Routes
       case '/mongoose':
       case '/mongoose':
         var queryFunctions = [];
         var queryFunctions = [];
-        
-        queries = Math.min(Math.max(queries, 1), 500);
-
         for (var i = 0; i < queries; i += 1) {
         for (var i = 0; i < queries; i += 1) {
           queryFunctions.push(mongooseQuery);
           queryFunctions.push(mongooseQuery);
         }
         }
@@ -240,9 +232,6 @@ if(cluster.isMaster) {
 
 
       case '/mongoose-update':
       case '/mongoose-update':
         var selectFunctions = [];
         var selectFunctions = [];
-        
-        queries = Math.min(Math.max(queries, 1), 500);
-
         for (var i = 0; i < queries; i += 1) {
         for (var i = 0; i < queries; i += 1) {
           selectFunctions.push(mongooseQuery);
           selectFunctions.push(mongooseQuery);
         }
         }
@@ -276,9 +265,6 @@ if(cluster.isMaster) {
       // Sequelize (MySQL ORM) Routes
       // Sequelize (MySQL ORM) Routes
       case '/mysql-orm':
       case '/mysql-orm':
         var queryFunctions = [];
         var queryFunctions = [];
-
-        queries = Math.min(Math.max(queries, 1), 500);
-
         for (var i = 0; i < queries; i += 1) {
         for (var i = 0; i < queries; i += 1) {
           queryFunctions.push(sequelizeQuery);
           queryFunctions.push(sequelizeQuery);
         }
         }
@@ -297,9 +283,6 @@ if(cluster.isMaster) {
 
 
       case '/mysql-orm-update':
       case '/mysql-orm-update':
         var selectFunctions = [];
         var selectFunctions = [];
-
-        queries = Math.min(Math.max(queries, 1), 500);
-
         for (var i = 0; i < queries; i += 1) {
         for (var i = 0; i < queries; i += 1) {
           selectFunctions.push(sequelizeQuery);
           selectFunctions.push(sequelizeQuery);
         }
         }
@@ -329,9 +312,6 @@ if(cluster.isMaster) {
       // Raw MongoDB Routes
       // Raw MongoDB Routes
       case '/mysql':
       case '/mysql':
         var queryFunctions = [];
         var queryFunctions = [];
-
-        queries = Math.min(Math.max(queries, 1), 500);
-
         for (var i = 0; i < queries; i += 1) {
         for (var i = 0; i < queries; i += 1) {
           queryFunctions.push(mysqlQuery);
           queryFunctions.push(mysqlQuery);
         }
         }
@@ -350,7 +330,6 @@ if(cluster.isMaster) {
 
 
       case '/mysql-update':
       case '/mysql-update':
         var queryFunctions = [];
         var queryFunctions = [];
-
         for (var i = 0; i < queries; i += 1) {
         for (var i = 0; i < queries; i += 1) {
           queryFunctions.push(mysqlUpdateQuery);
           queryFunctions.push(mysqlUpdateQuery);
         }
         }
@@ -363,7 +342,6 @@ if(cluster.isMaster) {
         });
         });
         break;
         break;
 
 
-
       default:
       default:
         // File not found handler
         // File not found handler
         res.writeHead(501, {'Content-Type': 'text/plain; charset=UTF-8'});
         res.writeHead(501, {'Content-Type': 'text/plain; charset=UTF-8'});