acquia-cloud 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53cb76feb20ac22454007a19fb6964fa0d6c17e4
-  data.tar.gz: ef0c5bed0661a57a91082e1c31b49d63f6d3c9bd
+  metadata.gz: 4182a6236125a8d1f01f9e91e413ed3f8d2c026a
+  data.tar.gz: 326ab2c189dc55f63ccf49959d1e0752f59396a5
 SHA512:
-  metadata.gz: a83a7da094a08ebbc25abf5557effd882899134848626c102166724ce3727b6d1e3d99da195d6e7b1e4ca4ce2ebf41779df396a3c9106cdadfbaee962a15d484
-  data.tar.gz: 5a0170443e5aa0361f071e755ef2033d2695c74ed6472959a4e66c9bfe77bcf2c7e98b8918d232d9d5f8463ab7ed91048ac8af18af91e5918d2f2032d7b0c786
+  metadata.gz: 830ea71f88ba33fc22c8eb3b249e0522916c92f2c7fe39c120a5501766bd170c906e0dec973c7fbf2b44e2d001acef6c24b96536347d63f75272b0e453440be1
+  data.tar.gz: 6a2bd7d7e024eb3ea6bddc47846b7c9753897c46bf503ccdf1ff42f681796ccd251eb375efcdf7ce075e74a06c15d4c091b53863dbbda4ba656df725bb9e452f

data/lib/acquia/cloud/logs/streamer.rb

@@ -1,7 +1,8 @@
-require 'socket'
-require 'websocket'
 require 'json'
+require 'socket'
+require 'time'
 require 'uri'
+require 'websocket'
 
 module Acquia
   class Cloud
@@ -12,6 +13,7 @@ module Acquia
         RECV_LENGTH = 16 * 1024
 
         attr_reader :remote_server
+        attr_accessor :keepalive_duration
 
         def initialize(url, message)
           @url = url
@@ -19,6 +21,8 @@ module Acquia
           @logs = []
           @available = []
           @enabled_types = []
+          @keepalive_duration = 5000
+          @last_keepalive = @last_data = Time.now
         end
 
         def debug
@@ -58,11 +62,11 @@ module Acquia
             opts[:type] = opts[:source].type
           end
 
-          send({
+          send(
             cmd: 'enable',
             server: opts[:server],
             type: opts[:type],
-          })
+          )
         end
 
         def enable_type(type)
@@ -78,11 +82,11 @@ module Acquia
             opts[:type] = opts[:source].type
           end
 
-          send({
+          send(
             cmd: 'disable',
             server: opts[:server],
             type: opts[:type],
-          })
+          )
         end
 
         def disable_type(type)
@@ -99,19 +103,35 @@ module Acquia
           end
         end
 
-        protected
+        # protected
 
         def send(message)
           message = message.to_json
           STDERR.puts "-> #{message}" if @debug
           frame = ::WebSocket::Frame::Outgoing::Client.new(version: @handshake.version, type: 'text', data: message)
-          @socket.print frame.to_s
+          @socket.send frame.to_s, 0
         end
 
         def update
+          # Send a keepalive if required
+          if Time.now - @last_keepalive < @keepalive_duration
+            send(cmd: 'keepalive')
+          end
+
           # Read as much as possible
-          @incoming << @socket.read_nonblock(RECV_LENGTH) while true
-        rescue ::IO::WaitReadable
+          while true
+            read = @socket.read_nonblock(RECV_LENGTH)
+            @last_data = Time.now
+            @incoming << read
+          end
+        rescue ::IO::WaitReadable => e
+          if Time.now - @last_data > @keepalive_duration * 1.5
+            # There hasn't been a socket level error, but we're worried at this
+            # point. Trigger a proper socket close 'just in case' then flag a
+            # broken pipe to downstream code.
+            close
+            raise Errno::EPIPE
+          end
           loop do
             msg = @incoming.next
             break unless msg

data/lib/acquia/cloud/version.rb

@@ -1,5 +1,5 @@
 module Acquia
   class Cloud
-    VERSION = '0.1.3'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acquia-cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Equiem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday