Просмотр исходного кода

Fixed Express to Hapi translation

Edward Bramanti 10 лет назад
Родитель
Сommit
6d7378ef32
2 измененных файлов с 10 добавлено и 6 удалено
  1. 9 5
      frameworks/JavaScript/express/app.js
  2. 1 1
      frameworks/JavaScript/hapi/app.js

+ 9 - 5
frameworks/JavaScript/express/app.js

@@ -28,7 +28,7 @@ var WorldSchema = new mongoose.Schema({
   MWorld = conn.model('World', WorldSchema);
 
 var sequelize = new Sequelize('hello_world', 'benchmarkdbuser', 'benchmarkdbpass', {
-  host: '127.0.0.1',
+  host: 'localhost',
   dialect: 'mysql',
   logging: false,
   pool: {
@@ -85,6 +85,12 @@ if (cluster.isMaster) {
     }
   }));
 
+  // Set headers for all routes
+  app.use(function(req, res, next) {
+    res.setHeader("Server", "Express");
+    return next();
+  });
+
   app.set('view engine', 'jade');
   app.set('views', __dirname + '/views');
 
@@ -148,8 +154,6 @@ if (cluster.isMaster) {
   });
 
   app.get('/fortune', function(req, res) {
-    if (windows) return res.send(501, 'Not supported on windows');
-    
     Fortune.findAll().complete(function (err, fortunes) {
       var newFortune = {id: 0, message: "Additional fortune added at request time."};
       fortunes.push(newFortune);
@@ -196,10 +200,10 @@ if (cluster.isMaster) {
   });
 
   app.get('/mysql-orm-update', function(req, res) {
-    var queries = isNaN(req.params.queries) ? 1 : parseInt(req.params.queries, 10)
+    var queries = isNaN(req.query.queries) ? 1 : parseInt(req.query.queries, 10)
       , selectFunctions = [];
 
-    queries = Math.min(queries, 500);
+    queries = Math.max(Math.min(queries, 500), 1);
 
     for (var i = 1; i <= queries; i++ ) {
       selectFunctions.push(function(callback) {

+ 1 - 1
frameworks/JavaScript/hapi/app.js

@@ -19,7 +19,7 @@ var WorldSchema = new mongoose.Schema({
 	MWorld = conn.model('World', WorldSchema);
 
 var sequelize = new Sequelize('hello_world', 'benchmarkdbuser', 'benchmarkdbpass', {
-	host: '127.0.0.1',
+	host: 'localhost',
 	dialect: 'mysql',
 	logging: false,
 	pool: {