commit: 45837c533e2d2bd0dd7ecde8c192a1af682be6cf
parent: 3fa8512474137e84cfaf37682e78a84995e5c862
Author: Clworld <clworld@ggtea.org>
Date: Mon, 29 May 2017 02:14:44 +0900
Re-add stream end log for WebSocket (#3397)
Diffstat:
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/streaming/index.js b/streaming/index.js
@@ -315,12 +315,14 @@ const startWorker = (workerId) => {
};
// Setup stream end for WebSockets
- const streamWsEnd = ws => (id, listener) => {
+ const streamWsEnd = (req, ws) => (id, listener) => {
ws.on('close', () => {
+ log.verbose(req.requestId, `Ending stream for ${req.accountId}`);
unsubscribe(id, listener);
});
ws.on('error', e => {
+ log.verbose(req.requestId, `Ending stream for ${req.accountId}`);
unsubscribe(id, listener);
});
};
@@ -370,19 +372,19 @@ const startWorker = (workerId) => {
switch(location.query.stream) {
case 'user':
- streamFrom(`timeline:${req.accountId}`, req, streamToWs(req, ws), streamWsEnd(ws));
+ streamFrom(`timeline:${req.accountId}`, req, streamToWs(req, ws), streamWsEnd(req, ws));
break;
case 'public':
- streamFrom('timeline:public', req, streamToWs(req, ws), streamWsEnd(ws), true);
+ streamFrom('timeline:public', req, streamToWs(req, ws), streamWsEnd(req, ws), true);
break;
case 'public:local':
- streamFrom('timeline:public:local', req, streamToWs(req, ws), streamWsEnd(ws), true);
+ streamFrom('timeline:public:local', req, streamToWs(req, ws), streamWsEnd(req, ws), true);
break;
case 'hashtag':
- streamFrom(`timeline:hashtag:${location.query.tag}`, req, streamToWs(req, ws), streamWsEnd(ws), true);
+ streamFrom(`timeline:hashtag:${location.query.tag}`, req, streamToWs(req, ws), streamWsEnd(req, ws), true);
break;
case 'hashtag:local':
- streamFrom(`timeline:hashtag:${location.query.tag}:local`, req, streamToWs(req, ws), streamWsEnd(ws), true);
+ streamFrom(`timeline:hashtag:${location.query.tag}:local`, req, streamToWs(req, ws), streamWsEnd(req, ws), true);
break;
default:
ws.close();