Browse Source

Merge pull request #2184 from knewmanTE/add-express-mongodb-fortune

Add express mongodb fortune
A Shawn Bandy 8 years ago
parent
commit
91c3bb4c44

+ 13 - 1
frameworks/JavaScript/express/app.js

@@ -156,7 +156,19 @@ if (cluster.isMaster) {
     });
     });
   });
   });
 
 
-  app.get('/fortune', function(req, res) {
+  app.get('/mongoose-fortune', function(req, res) {
+    MFortune.find({}, function(err, fortunes) {
+      var newFortune = {id: 0, message: "Additional fortune added at request time."};
+      fortunes.push(newFortune);
+      fortunes.sort(function (a, b) {
+        return (a.message < b.message) ? -1 : 1;
+      });
+
+      res.render('fortunes', {fortunes: fortunes});
+    });
+  });
+
+  app.get('/mysql-orm-fortune', function(req, res) {
     Fortune.findAll().then(function (fortunes) {
     Fortune.findAll().then(function (fortunes) {
       var newFortune = {id: 0, message: "Additional fortune added at request time."};
       var newFortune = {id: 0, message: "Additional fortune added at request time."};
       fortunes.push(newFortune);
       fortunes.push(newFortune);

+ 2 - 1
frameworks/JavaScript/express/benchmark_config.json

@@ -25,6 +25,7 @@
       "db_url": "/mongoose",
       "db_url": "/mongoose",
       "query_url": "/mongoose?queries=",
       "query_url": "/mongoose?queries=",
       "update_url": "/mongoose-update?queries=",
       "update_url": "/mongoose-update?queries=",
+      "fortune_url": "/mysql-orm-fortune",
       "port": 8080,
       "port": 8080,
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Micro",
       "classification": "Micro",
@@ -44,7 +45,7 @@
       "setup_file": "setup",
       "setup_file": "setup",
       "db_url": "/mysql-orm",
       "db_url": "/mysql-orm",
       "query_url": "/mysql-orm?queries=",
       "query_url": "/mysql-orm?queries=",
-      "fortune_url": "/fortune",
+      "fortune_url": "/mysql-orm-fortune",
       "update_url": "/mysql-orm-update?queries=",
       "update_url": "/mysql-orm-update?queries=",
       "port": 8080,
       "port": 8080,
       "approach": "Realistic",
       "approach": "Realistic",