logstash-input-acquia 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c541c11c86f158df9742931c69d883ea49259bd
-  data.tar.gz: dddc1fd2a2ede13cd34a8ddb1b2d7fa4d82d746d
+  metadata.gz: 9436f4cd00f374d9089a65020fd587e6b7b244d5
+  data.tar.gz: 3d4ca97ba2ce0dec8a66a94b17a2c058319a2466
 SHA512:
-  metadata.gz: da0d0f7d7bfa94fb6df97e8971f125d40922314ea5b666b8e580bae9677ccd9a5419a9d618c878b319ccb58038a021b6968b61d0c425495922d7818edb8a51bd
-  data.tar.gz: 27fddfbfedea6d867581ce0feaaea97735d3445fef7df24b4a48567e60eaed1007766d362ad71a72a7f4422bcba6e3813a6058c8ce228de5911d1285b2590a79
+  metadata.gz: d0e439f17026d6e6d4b049942778512100fa2c77e0a21ba2ef593197cbee3a4ca2549b605042d1ce90bc4ba4d81b8b5b192884216db05ab13211e3893df49531
+  data.tar.gz: 81600a01b0fddc4498af121452502462f74fdfa47362741a5e6d307e7ca5aee0fb3053a6b98ab9a1edcf20e5af97fe6279043ed098d3ae1688788fcede15e6b8

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.6.0

data/lib/logstash/inputs/acquia.rb

@@ -16,31 +16,32 @@ class LogStash::Inputs::Acquia < LogStash::Inputs::Base
   config :site, :validate => :string, :required => true
   config :environments, :validate => :array, :default => ['prod']
   config :types, :validate => :array, :default => ['drupal-watchdog', 'php-error']
+  config :interval, :validate => :number, :default => 5
+  config :debug, :validate => :boolean, :default => false
 
   public
   def register
     @cloud = ::Acquia::Cloud.new(:credentials => "#{@username}:#{@api_key}")
-    @site = @cloud.site(@site)
-    @streams = {}
-    @environments.each do |env|
-      @logger.info "Opening log stream for #{env}."
-      stream = @site.environment(env).logstream
-      @types.each do |type|
-        stream.enable_type type
-      end
-      stream.connect
-      @streams[env] = stream
-    end
+    @acsite = @cloud.site(@site)
   end
 
   def run(queue)
-    Stud.interval(1) do
+    @streams = {}
+    @environments.each do |env|
+      @streams[env] = get_stream(env)
+    end
+    Stud.interval(@interval) do
       @streams.each do |env, stream|
-        stream.each_log do |log|
-          # p log
-          event = generate_event(env, log)
-          decorate(event)
-          queue << event
+        begin
+          stream.each_log do |log|
+            # p log
+            event = generate_event(env, log)
+            decorate(event)
+            queue << event
+          end
+        rescue Errno::EPIPE
+          @logger.warn("Detected a broken pipe for #{env} on #{@site}, reconnecting.")
+          @streams[env] = get_stream(env)
         end
       end
     end
@@ -54,13 +55,25 @@ class LogStash::Inputs::Acquia < LogStash::Inputs::Base
   end
 
   private
+  def get_stream(env)
+    @logger.info "Opening log stream for #{env}."
+    stream = @acsite.environment(env).logstream
+    @types.each do |type|
+      stream.enable_type type
+    end
+    stream.keepalive_duration = @interval * 2
+    stream.debug if @debug
+    stream.connect
+    stream
+  end
+
   def generate_event(env, log)
     # Remove useless API cruft.
     log.delete 'cmd'
 
     # Save the environment this message is coming from.
     log['acquia'] = {
-        'site' => @site.name,
+        'site' => @acsite.name,
         'environment' => env,
     }
 

data/logstash-input-acquia.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'logstash-core', '~> 1.5'
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'stud'
-  s.add_runtime_dependency 'acquia-cloud', '>= 0.1.2', '< 2.0.0'
+  s.add_runtime_dependency 'acquia-cloud', '>= 0.2.1', '< 2.0.0'
 
   s.add_development_dependency 'logstash-devutils'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-acquia
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.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
   requirement: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.1
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.1
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0