Branch was updated using the 'autoupdate branch' Actions workflow.

Octomerger · web-flow · commit 14ac43db8e11 · 2021-03-20T06:08:16.000+10:00
diff --git a/app.json b/app.json
@@ -3,7 +3,8 @@
   "env": {
     "NODE_ENV": "production",
     "NPM_CONFIG_PRODUCTION": "true",
-    "ENABLED_LANGUAGES": "en"
+    "ENABLED_LANGUAGES": "en",
+    "WEB_CONCURRENCY": "1"
   },
   "buildpacks": [
     { "url": "heroku/nodejs" }
diff --git a/data/graphql/ghae/schema.docs-ghae.graphql b/data/graphql/ghae/schema.docs-ghae.graphql
@@ -24946,6 +24946,11 @@ type RefUpdateRule {
   """
   requiredStatusCheckContexts: [String]
 
+  """
+  Are reviews from code owners required to update matching branches.
+  """
+  requiresCodeOwnerReviews: Boolean!
+
   """
   Are merge commits prohibited from being pushed to this branch.
   """
@@ -24956,6 +24961,11 @@ type RefUpdateRule {
   """
   requiresSignatures: Boolean!
 
+  """
+  Is the viewer allowed to dismiss reviews.
+  """
+  viewerAllowedToDismissReviews: Boolean!
+
   """
   Can the viewer push to the branch
   """
diff --git a/data/graphql/schema.docs.graphql b/data/graphql/schema.docs.graphql
@@ -26875,6 +26875,11 @@ type RefUpdateRule {
   """
   requiredStatusCheckContexts: [String]
 
+  """
+  Are reviews from code owners required to update matching branches.
+  """
+  requiresCodeOwnerReviews: Boolean!
+
   """
   Are merge commits prohibited from being pushed to this branch.
   """
@@ -26885,6 +26890,11 @@ type RefUpdateRule {
   """
   requiresSignatures: Boolean!
 
+  """
+  Is the viewer allowed to dismiss reviews.
+  """
+  viewerAllowedToDismissReviews: Boolean!
+
   """
   Can the viewer push to the branch
   """
diff --git a/lib/app.js b/lib/app.js
@@ -0,0 +1,5 @@
+const express = require('express')
+
+const app = express()
+require('../middleware')(app)
+module.exports = app
diff --git a/lib/check-node-version.js b/lib/check-node-version.js
@@ -5,5 +5,5 @@ const { engines } = require('../package.json')
 if (!semver.satisfies(process.version, engines.node)) {
   console.error(`\n\nYou're using Node.js ${process.version}, but ${engines.node} is required`)
   console.error('Visit nodejs.org to download an installer for the latest LTS version.\n\n')
-  process.exit()
+  process.exit(1)
 }
diff --git a/lib/graphql/static/changelog.json b/lib/graphql/static/changelog.json
@@ -1,4 +1,18 @@
 [
+  {
+    "schemaChanges": [
+      {
+        "title": "The GraphQL schema includes these changes:",
+        "changes": [
+          "Field `requiresCodeOwnerReviews` was added to object type `RefUpdateRule`",
+          "Field `viewerAllowedToDismissReviews` was added to object type `RefUpdateRule`"
+        ]
+      }
+    ],
+    "previewChanges": [],
+    "upcomingChanges": [],
+    "date": "2021-03-19"
+  },
   {
     "schemaChanges": [
       {
diff --git a/lib/graphql/static/prerendered-objects.json b/lib/graphql/static/prerendered-objects.json
diff --git a/lib/graphql/static/schema-dotcom.json b/lib/graphql/static/schema-dotcom.json
@@ -38492,6 +38492,14 @@
           "kind": "scalars",
           "href": "/graphql/reference/scalars#string"
         },
+        {
+          "name": "requiresCodeOwnerReviews",
+          "description": "<p>Are reviews from code owners required to update matching branches.</p>",
+          "type": "Boolean!",
+          "id": "boolean",
+          "kind": "scalars",
+          "href": "/graphql/reference/scalars#boolean"
+        },
         {
           "name": "requiresLinearHistory",
           "description": "<p>Are merge commits prohibited from being pushed to this branch.</p>",
@@ -38508,6 +38516,14 @@
           "kind": "scalars",
           "href": "/graphql/reference/scalars#boolean"
         },
+        {
+          "name": "viewerAllowedToDismissReviews",
+          "description": "<p>Is the viewer allowed to dismiss reviews.</p>",
+          "type": "Boolean!",
+          "id": "boolean",
+          "kind": "scalars",
+          "href": "/graphql/reference/scalars#boolean"
+        },
         {
           "name": "viewerCanPush",
           "description": "<p>Can the viewer push to the branch.</p>",
diff --git a/lib/graphql/static/schema-ghae.json b/lib/graphql/static/schema-ghae.json
@@ -35590,6 +35590,14 @@
           "kind": "scalars",
           "href": "/graphql/reference/scalars#string"
         },
+        {
+          "name": "requiresCodeOwnerReviews",
+          "description": "<p>Are reviews from code owners required to update matching branches.</p>",
+          "type": "Boolean!",
+          "id": "boolean",
+          "kind": "scalars",
+          "href": "/graphql/reference/scalars#boolean"
+        },
         {
           "name": "requiresLinearHistory",
           "description": "<p>Are merge commits prohibited from being pushed to this branch.</p>",
@@ -35606,6 +35614,14 @@
           "kind": "scalars",
           "href": "/graphql/reference/scalars#boolean"
         },
+        {
+          "name": "viewerAllowedToDismissReviews",
+          "description": "<p>Is the viewer allowed to dismiss reviews.</p>",
+          "type": "Boolean!",
+          "id": "boolean",
+          "kind": "scalars",
+          "href": "/graphql/reference/scalars#boolean"
+        },
         {
           "name": "viewerCanPush",
           "description": "<p>Can the viewer push to the branch.</p>",
diff --git a/lib/prefix-stream-write.js b/lib/prefix-stream-write.js
@@ -0,0 +1,25 @@
+module.exports = function prefixStreamWrite (writableStream, prefix) {
+  const oldWrite = writableStream.write
+
+  function newWrite (...args) {
+    const [chunk, encoding] = args
+
+    // Prepend the prefix if the chunk is either a string or a Buffer.
+    // Otherwise, just leave it alone to be safe.
+    if (typeof chunk === 'string') {
+      // Only prepend the prefix is the `encoding` is safe or not provided.
+      // If it's a function, it is third arg `callback` provided as optional second
+      if (!encoding || encoding === 'utf8' || typeof encoding === 'function') {
+        args[0] = prefix + chunk
+      }
+    } else if (Buffer.isBuffer(chunk)) {
+      args[0] = Buffer.concat([Buffer.from(prefix), chunk])
+    }
+
+    return oldWrite.apply(this, args)
+  }
+
+  writableStream.write = newWrite
+
+  return writableStream
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -97,6 +97,7 @@
     "slash": "^3.0.0",
     "strip-html-comments": "^1.0.0",
     "style-loader": "^1.2.1",
+    "throng": "^5.0.0",
     "unified": "^8.4.2",
     "unist-util-visit": "^2.0.3",
     "uuid": "^8.3.0",
diff --git a/script/enterprise-server-deprecations/archive-version.js b/script/enterprise-server-deprecations/archive-version.js
@@ -3,7 +3,7 @@
 const fs = require('fs')
 const path = require('path')
 const { execSync } = require('child_process')
-const server = require('../../server')
+const app = require('../lib/app')
 const port = '4001'
 const host = `http://localhost:${port}`
 const scrape = require('website-scraper')
@@ -155,7 +155,7 @@ async function main () {
     plugins: [new RewriteAssetPathsPlugin(version, tempDirectory)]
   }
 
-  server.listen(port, async () => {
+  app.listen(port, async () => {
     console.log(`started server on ${host}`)
 
     await scrape(scraperOptions).catch(err => {
diff --git a/server.js b/server.js
@@ -1,42 +1,116 @@
 require('dotenv').config()
 
+const throng = require('throng')
+const os = require('os')
+const portUsed = require('port-used')
+const prefixStreamWrite = require('./lib/prefix-stream-write')
+
+// Intentionally require these for both cluster primary and workers
 require('./lib/check-node-version')
 require('./lib/handle-exceptions')
 require('./lib/feature-flags')
 
-const express = require('express')
-const portUsed = require('port-used')
-const warmServer = require('./lib/warm-server')
-const port = Number(process.env.PORT) || 4000
-const app = express()
-
-require('./middleware')(app)
-
-// prevent the app from starting up during tests
-/* istanbul ignore next */
-if (!module.parent) {
-  // check that the development server is not already running
-  portUsed.check(port).then(async status => {
-    if (status === false) {
-      // If in a deployed environment, warm the server at the start
-      if (process.env.NODE_ENV === 'production') {
-        // If in a true production environment, wait for the cache to be fully warmed.
-        if (process.env.HEROKU_PRODUCTION_APP || process.env.GITHUB_ACTIONS) {
-          await warmServer()
-        }
-      }
-
-      // workaround for https://github.com/expressjs/express/issues/1101
-      const server = require('http').createServer(app)
-      server.listen(port, () => console.log(`app running on http://localhost:${port}`))
-        .on('error', () => server.close())
-    } else {
-      console.log(`\n\n\nPort ${port} is not available. You may already have a server running.`)
-      console.log('Try running `killall node` to shut down all your running node processes.\n\n\n')
-      console.log('\x07') // system 'beep' sound
-      process.exit(1)
-    }
+const { PORT, NODE_ENV } = process.env
+const port = Number(PORT) || 4000
+
+function main () {
+  // Spin up a cluster!
+  throng({
+    master: setupPrimary,
+    worker: setupWorker,
+    count: calculateWorkerCount()
+  })
+}
+
+// Start the server!
+main()
+
+// This function will only be run in the primary process
+async function setupPrimary () {
+  process.on('beforeExit', () => {
+    console.log('Shutting down primary...')
+    console.log('Exiting!')
+  })
+
+  console.log('Starting up primary...')
+
+  // Check that the development server is not already running
+  const portInUse = await portUsed.check(port)
+  if (portInUse) {
+    console.log(`\n\n\nPort ${port} is not available. You may already have a server running.`)
+    console.log('Try running `killall node` to shut down all your running node processes.\n\n\n')
+    console.log('\x07') // system 'beep' sound
+    process.exit(1)
+  }
+}
+
+// IMPORTANT: This function will be run in a separate worker process!
+async function setupWorker (id, disconnect) {
+  let exited = false
+
+  // Wrap stdout and stderr to include the worker ID as a static prefix
+  // console.log('hi') => '[worker.1]: hi'
+  const prefix = `[worker.${id}]: `
+  prefixStreamWrite(process.stdout, prefix)
+  prefixStreamWrite(process.stderr, prefix)
+
+  process.on('beforeExit', () => {
+    console.log('Exiting!')
   })
+
+  process.on('SIGTERM', shutdown)
+  process.on('SIGINT', shutdown)
+
+  console.log('Starting up worker...')
+
+  // Load the server in each worker process and share the port via sharding
+  const app = require('./lib/app')
+  const warmServer = require('./lib/warm-server')
+
+  // If in a deployed environment...
+  if (NODE_ENV === 'production') {
+    // If in a true production environment, wait for the cache to be fully warmed.
+    if (process.env.HEROKU_PRODUCTION_APP || process.env.GITHUB_ACTIONS) {
+      await warmServer()
+    }
+  }
+
+  // Workaround for https://github.com/expressjs/express/issues/1101
+  const server = require('http').createServer(app)
+  server
+    .listen(port, () => console.log(`app running on http://localhost:${port}`))
+    .on('error', () => server.close())
+
+  function shutdown () {
+    if (exited) return
+    exited = true
+
+    console.log('Shutting down worker...')
+    disconnect()
+  }
 }
 
-module.exports = app
+function calculateWorkerCount () {
+  // Heroku's recommended WEB_CONCURRENCY count based on the WEB_MEMORY config
+  const { WEB_CONCURRENCY } = process.env
+
+  const recommendedCount = parseInt(WEB_CONCURRENCY, 10) || 1
+  const cpuCount = os.cpus().length
+
+  // Ensure the recommended count is AT LEAST 1 for safety
+  let workerCount = Math.max(recommendedCount, 1)
+
+  // Let's do some math...
+  // If in a deployed environment...
+  if (NODE_ENV === 'production') {
+    // If WEB_MEMORY or WEB_CONCURRENCY values were configured in Heroku, use
+    // the smaller value between their recommendation vs. the CPU count
+    if (WEB_CONCURRENCY) {
+      workerCount = Math.min(recommendedCount, cpuCount)
+    } else {
+      workerCount = cpuCount
+    }
+  }
+
+  return workerCount
+}
diff --git a/tests/helpers/supertest.js b/tests/helpers/supertest.js
@@ -3,7 +3,7 @@
 
 const cheerio = require('cheerio')
 const supertest = require('supertest')
-const app = require('../../server')
+const app = require('../../lib/app')
 
 const helpers = {}
 
diff --git a/tests/rendering/events.js b/tests/rendering/events.js
@@ -1,7 +1,7 @@
 const request = require('supertest')
 const nock = require('nock')
 const cheerio = require('cheerio')
-const app = require('../../server')
+const app = require('../../lib/app')
 
 describe('POST /events', () => {
   jest.setTimeout(60 * 1000)
diff --git a/tests/routing/deprecated-enterprise-versions.js b/tests/routing/deprecated-enterprise-versions.js
@@ -1,4 +1,4 @@
-const app = require('../../server')
+const app = require('../../lib/app')
 const enterpriseServerReleases = require('../../lib/enterprise-server-releases')
 const { get, getDOM } = require('../helpers/supertest')
 const supertest = require('supertest')
diff --git a/tests/routing/redirects.js b/tests/routing/redirects.js

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ const { engines } = require('../package.json')`
`5`	`5`	`if (!semver.satisfies(process.version, engines.node)) {`
`6`	`6`	console.error(`\n\nYou're using Node.js ${process.version}, but ${engines.node} is required`)
`7`	`7`	`console.error('Visit nodejs.org to download an installer for the latest LTS version.\n\n')`
`8`		`- process.exit()`
	`8`	`+ process.exit(1)`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,18 @@`
`1`	`1`	`[`
	`2`	`+ {`
	`3`	`+ "schemaChanges": [`
	`4`	`+ {`
	`5`	`+ "title": "The GraphQL schema includes these changes:",`
	`6`	`+ "changes": [`
	`7`	+ "Field `requiresCodeOwnerReviews` was added to object type `RefUpdateRule`",
	`8`	+ "Field `viewerAllowedToDismissReviews` was added to object type `RefUpdateRule`"
	`9`	`+ ]`
	`10`	`+ }`
	`11`	`+ ],`
	`12`	`+ "previewChanges": [],`
	`13`	`+ "upcomingChanges": [],`
	`14`	`+ "date": "2021-03-19"`
	`15`	`+ },`
`2`	`16`	`{`
`3`	`17`	`"schemaChanges": [`
`4`	`18`	`{`