Merge pull request #12031 from github/repo-sync

repo sync

Author: Octomerger

lib/handle-exceptions.js

@@ -9,10 +9,20 @@ process.on('uncaughtException', async (err) => {
   }
 
   console.error(err)
-  await FailBot.report(err)
+  try {
+    await FailBot.report(err)
+  } catch (failBotError) {
+    console.warn('Even sending the uncaughtException error to FailBot failed!')
+    console.error(failBotError)
+  }
 })
 
 process.on('unhandledRejection', async (err) => {
   console.error(err)
-  await FailBot.report(err)
+  try {
+    await FailBot.report(err)
+  } catch (failBotError) {
+    console.warn('Even sending the unhandledRejection error to FailBot failed!')
+    console.error(failBotError)
+  }
 })

middleware/events.js

@@ -19,15 +19,11 @@ router.post('/', async function postEvents(req, res, next) {
     return res.status(400).json(isDev ? ajv.errorsText() : {})
   }
 
+  res.json({})
+
   if (req.hydro.maySend()) {
-    // intentionally don't await this async request
-    // so that the http response afterwards is sent immediately
-    req.hydro.publish(hydroNames[fields.type], omit(fields, OMIT_FIELDS)).catch((e) => {
-      if (isDev) console.error(e)
-    })
+    await req.hydro.publish(hydroNames[fields.type], omit(fields, OMIT_FIELDS))
   }
-
-  return res.status(200).json({})
 })
 
 export default router