Skip to content

Commit 67a2f7e

Browse files
JHyeokfranz1981
authored andcommitted
Revert "Fix use the physical CPU count from Express (TechEmpower#7986)" (TechEmpower#8042)
This reverts commit bb94cc2.
1 parent b12ff9d commit 67a2f7e

File tree

5 files changed

+11
-18
lines changed

5 files changed

+11
-18
lines changed

frameworks/JavaScript/express/app.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
const cluster = require('cluster'),
7-
physicalCpuCount = require('physical-cpu-count'),
7+
numCPUs = require('os').cpus().length,
88
express = require('express');
99

1010
const bodyParser = require('body-parser');
@@ -13,7 +13,7 @@ if (cluster.isPrimary) {
1313
console.log(`Primary ${process.pid} is running`);
1414

1515
// Fork workers.
16-
for (let i = 0; i < physicalCpuCount; i++) {
16+
for (let i = 0; i < numCPUs; i++) {
1717
cluster.fork();
1818
}
1919

@@ -41,7 +41,5 @@ if (cluster.isPrimary) {
4141
app.get('/plaintext', (req, res) =>
4242
res.header('Content-Type', 'text/plain').send('Hello, World!'));
4343

44-
app.listen(8080, () => {
45-
console.log('listening on port 8080');
46-
});
44+
app.listen(8080);
4745
}

frameworks/JavaScript/express/mongodb-app.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
const cluster = require('cluster'),
7-
physicalCpuCount = require('physical-cpu-count'),
7+
numCPUs = require('os').cpus().length,
88
express = require('express'),
99
mongoose = require('mongoose'),
1010
conn = mongoose.connect('mongodb://tfb-database/hello_world');
@@ -33,7 +33,7 @@ const FortuneSchema = new mongoose.Schema({
3333

3434
if (cluster.isPrimary) {
3535
// Fork workers.
36-
for (let i = 0; i < physicalCpuCount; i++) {
36+
for (let i = 0; i < numCPUs; i++) {
3737
cluster.fork();
3838
}
3939

@@ -101,7 +101,5 @@ if (cluster.isPrimary) {
101101
res.send(results);
102102
});
103103

104-
app.listen(8080, () => {
105-
console.log('listening on port 8080');
106-
});
104+
app.listen(8080);
107105
}

frameworks/JavaScript/express/mysql-app.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
const cluster = require('cluster'),
7-
physicalCpuCount = require('physical-cpu-count'),
7+
numCPUs = require('os').cpus().length,
88
express = require('express'),
99
Sequelize = require('sequelize');
1010

@@ -45,7 +45,7 @@ const Fortune = sequelize.define('Fortune', {
4545

4646
if (cluster.isPrimary) {
4747
// Fork workers.
48-
for (let i = 0; i < physicalCpuCount; i++) {
48+
for (let i = 0; i < numCPUs; i++) {
4949
cluster.fork();
5050
}
5151

@@ -127,7 +127,5 @@ if (cluster.isPrimary) {
127127
res.send(results);
128128
});
129129

130-
app.listen(8080, () => {
131-
console.log('listening on port 8080');
132-
});
130+
app.listen(8080);
133131
}

frameworks/JavaScript/express/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"mysql2": "2.2.5",
1212
"pg": "8.5.0",
1313
"pg-promise": "10.7.3",
14-
"physical-cpu-count": "^2.0.0",
1514
"pug": "2.0.1",
1615
"sequelize": "5.15.1"
1716
}

frameworks/JavaScript/express/postgresql-app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Module dependencies.
33
*/
44
const cluster = require('cluster'),
5-
physicalCpuCount = require('physical-cpu-count'),
5+
numCPUs = require('os').cpus().length,
66
express = require('express'),
77
helper = require('./helper');
88

@@ -51,7 +51,7 @@ const randomWorldPromise = () => {
5151

5252
if (cluster.isPrimary) {
5353
// Fork workers.
54-
for (let i = 0; i < physicalCpuCount; i++) {
54+
for (let i = 0; i < numCPUs; i++) {
5555
cluster.fork();
5656
}
5757

0 commit comments

Comments
 (0)