Revert "Fix use the physical CPU count from Express (#7986)" (#8042)

This reverts commit bb94cc2.
TechEmpower · Mar 17, 2023 · 59cf159 · 59cf159
1 parent 0fe7845
commit 59cf159
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 18 deletions.
diff --git a/frameworks/JavaScript/express/app.js b/frameworks/JavaScript/express/app.js
@@ -4,7 +4,7 @@
  */
 
 const cluster = require('cluster'),
-  physicalCpuCount = require('physical-cpu-count'),
+  numCPUs = require('os').cpus().length,
   express = require('express');
 
 const bodyParser = require('body-parser');
@@ -13,7 +13,7 @@ if (cluster.isPrimary) {
   console.log(`Primary ${process.pid} is running`);
 
   // Fork workers.
-  for (let i = 0; i < physicalCpuCount; i++) {
+  for (let i = 0; i < numCPUs; i++) {
     cluster.fork();
   }
 
@@ -41,7 +41,5 @@ if (cluster.isPrimary) {
   app.get('/plaintext', (req, res) =>
     res.header('Content-Type', 'text/plain').send('Hello, World!'));
 
-  app.listen(8080, () => {
-    console.log('listening on port 8080');
-  });
+  app.listen(8080);
 }
diff --git a/frameworks/JavaScript/express/mongodb-app.js b/frameworks/JavaScript/express/mongodb-app.js
@@ -4,7 +4,7 @@
  */
 
 const cluster = require('cluster'),
-  physicalCpuCount = require('physical-cpu-count'),
+  numCPUs = require('os').cpus().length,
   express = require('express'),
   mongoose = require('mongoose'),
   conn = mongoose.connect('mongodb://tfb-database/hello_world');
@@ -33,7 +33,7 @@ const FortuneSchema = new mongoose.Schema({
 
 if (cluster.isPrimary) {
   // Fork workers.
-  for (let i = 0; i < physicalCpuCount; i++) {
+  for (let i = 0; i < numCPUs; i++) {
     cluster.fork();
   }
 
@@ -101,7 +101,5 @@ if (cluster.isPrimary) {
     res.send(results);
   });
 
-  app.listen(8080, () => {
-    console.log('listening on port 8080');
-  });
+  app.listen(8080);
 }
diff --git a/frameworks/JavaScript/express/mysql-app.js b/frameworks/JavaScript/express/mysql-app.js
@@ -4,7 +4,7 @@
  */
 
 const cluster = require('cluster'),
-  physicalCpuCount = require('physical-cpu-count'),
+  numCPUs = require('os').cpus().length,
   express = require('express'),
   Sequelize = require('sequelize');
 
@@ -45,7 +45,7 @@ const Fortune = sequelize.define('Fortune', {
 
 if (cluster.isPrimary) {
   // Fork workers.
-  for (let i = 0; i < physicalCpuCount; i++) {
+  for (let i = 0; i < numCPUs; i++) {
     cluster.fork();
   }
 
@@ -127,7 +127,5 @@ if (cluster.isPrimary) {
     res.send(results);
   });
 
-  app.listen(8080, () => {
-    console.log('listening on port 8080');
-  });
+  app.listen(8080);
 }
diff --git a/frameworks/JavaScript/express/package.json b/frameworks/JavaScript/express/package.json
@@ -11,7 +11,6 @@
     "mysql2": "2.2.5",
     "pg": "8.5.0",
     "pg-promise": "10.7.3",
-    "physical-cpu-count": "^2.0.0",
     "pug": "2.0.1",
     "sequelize": "5.15.1"
   }

diff --git a/frameworks/JavaScript/express/postgresql-app.js b/frameworks/JavaScript/express/postgresql-app.js
@@ -2,7 +2,7 @@
  * Module dependencies.
  */
 const cluster = require('cluster'),
-  physicalCpuCount = require('physical-cpu-count'),
+  numCPUs = require('os').cpus().length,
   express = require('express'),
   helper = require('./helper');
 
@@ -51,7 +51,7 @@ const randomWorldPromise = () => {
 
 if (cluster.isPrimary) {
   // Fork workers.
-  for (let i = 0; i < physicalCpuCount; i++) {
+  for (let i = 0; i < numCPUs; i++) {
     cluster.fork();
   }