From 302270ddc05fa30e16ad35cb6d7b946f47ea0859 Mon Sep 17 00:00:00 2001 From: benzrf Date: Fri, 20 May 2016 11:23:18 -0400 Subject: [PATCH 1/4] Handle received data asynchronously --- lib/slack/real_time/concurrency/celluloid.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/slack/real_time/concurrency/celluloid.rb b/lib/slack/real_time/concurrency/celluloid.rb index d835ef46..78b5d2f4 100644 --- a/lib/slack/real_time/concurrency/celluloid.rb +++ b/lib/slack/real_time/concurrency/celluloid.rb @@ -47,6 +47,10 @@ def close def read buffer = socket.readpartial(BLOCK_SIZE) + async.handle_read(buffer) + end + + def handle_read(buffer) logger.debug("#{self.class}##{__method__}") { buffer } driver.parse buffer end From dd90c0996cc58eea23f20d8310bc1a9c5b866859 Mon Sep 17 00:00:00 2001 From: benzrf Date: Fri, 20 May 2016 17:08:40 -0400 Subject: [PATCH 2/4] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67f839ce..0d4ebd6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ### 0.7.4 (Next) * Your contribution here. +* [#93](https://github.com/dblock/slack-ruby-client/pull/93): Fix: When using Celluloid concurrency, handle input from the TCP socket asynchronously from reading more. - [@benzrf](https://github.com/benzrf). ### 0.7.3 (5/14/2016) From a677c8389fb24aaea74fda0c7c042ff34a5ae99f Mon Sep 17 00:00:00 2001 From: benzrf Date: Sat, 21 May 2016 11:23:56 -0400 Subject: [PATCH 3/4] Fix vcr --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 12425c30..19ebcb31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,3 +23,6 @@ matrix: git: submodules: false + +before_install: + - gem update --system From 4e91c1a740e38865678dab721a72c2089c0d4998 Mon Sep 17 00:00:00 2001 From: benzrf Date: Sat, 21 May 2016 11:47:02 -0400 Subject: [PATCH 4/4] Fix a bundler issue --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 19ebcb31..deb9ce36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,4 +25,5 @@ git: submodules: false before_install: + - gem update bundler - gem update --system