From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 2 Feb 2017 14:20:31 +0000 (+0100)
Subject: Fix potential resource leaks in streaming server
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b6c922f169b6ec76d6e55336ac8a76e4f3e3843a;p=mastodon.git

Fix potential resource leaks in streaming server
---

diff --git a/streaming/index.js b/streaming/index.js
index 945e287f5..99aa5b040 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -45,7 +45,7 @@ const authenticationMiddleware = (req, res, next) => {
       return next(err)
     }
 
-    client.query('SELECT oauth_access_tokens.resource_owner_id, users.account_id FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id WHERE token = $1 LIMIT 1', [token], (err, result) => {
+    client.query('SELECT oauth_access_tokens.resource_owner_id, users.account_id FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id WHERE oauth_access_tokens.token = $1 LIMIT 1', [token], (err, result) => {
       done()
 
       if (err) {
@@ -115,8 +115,13 @@ const streamFrom = (id, req, res, needsFiltering = false) => {
     }
   })
 
-  // Heartbeat to keep connection alive
-  setInterval(() => res.write(':thump\n'), 15000)
+  const heartbeat = setInterval(() => res.write(':thump\n'), 15000)
+
+  req.on('close', () => {
+    log.verbose(`Ending stream from ${id} for ${req.accountId}`)
+    clearInterval(heartbeat)
+    redisClient.quit()
+  })
 
   redisClient.subscribe(id)
 }