logstash-output-loggly 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21dafec395d796820f3c375fda13d3bd0a3b86ca
-  data.tar.gz: f1c4b7de15a7aa68414afba7aaf06c5fbcdfd64b
+  metadata.gz: ca11a79fa8a9b3f8d1d5d46e9acf8765208e70d3
+  data.tar.gz: 208aae37bf9ed33d6570d2468f1eac8f2f7dfd0b
 SHA512:
-  metadata.gz: 146fe159bfefebd04f215a781259ca840851b1f5e25b9bc84fbaa57c01c12b9713a76f84c88889bad296ed916dbaa564f0c3c3f199c0344bd7c6f0f4fa88b40b
-  data.tar.gz: cd5ad970776b3b8247dac2dc66bd21f7f823c5df3bef8b25a9f3e38a77e8b780200954fb7ce145a2ac377bf67e191943c742d2f03a0d23ac640e06edbc4fc8b5
+  metadata.gz: 688dbae1838330cb2e1829ef103d945fb2898ca13448fa348ee0cf0c5559586c26b6255e75b7832e77c366464f84f26dffc2c73f54d0dbe62bc1f554018f3e80
+  data.tar.gz: d9fa90bfec39c4223e7313b626818b26635661d76629b2c2fbb25e6340fc740eb576a3bd25b88f6356b6ee98d2399e1d5932f880ac2605422636ddc04523919a

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.3
+ - Adding exception handling and retries
+
 ## 2.0.0
  - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
    instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895

data/README.md

@@ -1,5 +1,8 @@
 # Logstash Plugin
 
+[![Build
+Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Outputs/job/logstash-plugin-output-loggly-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Outputs/job/logstash-plugin-output-loggly-unit/)
+
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.

data/lib/logstash/outputs/loggly.rb

@@ -37,7 +37,7 @@ class LogStash::Outputs::Loggly < LogStash::Outputs::Base
   # The loggly http input key to send to.
   # This is usually visible in the Loggly 'Inputs' page as something like this:
   # ....
-  #     https://logs.hoover.loggly.net/inputs/abcdef12-3456-7890-abcd-ef0123456789
+  #     https://logs-01.loggly.net/inputs/abcdef12-3456-7890-abcd-ef0123456789
   #                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   #                                           \---------->   key   <-------------/
   # ....
@@ -59,6 +59,16 @@ class LogStash::Outputs::Loggly < LogStash::Outputs::Base
   # https://www.loggly.com/docs/source-groups/
   config :tag, :validate => :string, :default => "logstash"
 
+  # Retry count. 
+  # It may be possible that the request may timeout due to slow Internet connection
+  # if such condition appears, retry_count helps in retrying request for multiple times
+  # It will try to submit request until retry_count and then halt
+  config :retry_count, :validate => :number, :default => 5
+
+  # Can Retry.
+  # Setting this value true helps user to send multiple retry attempts if the first request fails
+  config :can_retry, :validate => :boolean, :default => true
+
   # Proxy Host
   config :proxy_host, :validate => :string
 
@@ -72,7 +82,14 @@ class LogStash::Outputs::Loggly < LogStash::Outputs::Base
   config :proxy_password, :validate => :password, :default => ""
 
 
-  public
+  # HTTP constants
+  HTTP_SUCCESS = "200"
+  HTTP_FORBIDDEN = "403"
+  HTTP_NOT_FOUND = "404"
+  HTTP_INTERNAL_SERVER_ERROR = "500"
+  HTTP_GATEWAY_TIMEOUT = "504"
+
+public
   def register
     # nothing to do
   end
@@ -117,17 +134,59 @@ class LogStash::Outputs::Loggly < LogStash::Outputs::Base
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     end
 
-    # post message
     request = Net::HTTP::Post.new(url.path)
     request.body = message
-    response = http.request(request)
 
-    if response.is_a?(Net::HTTPSuccess)
-      @logger.info("Event send to Loggly OK!")
-    else
-      @logger.warn("HTTP error", :error => response.error!)
+    # Variable for count total retries
+    totalRetries = 0
+
+    #try posting once when can_retry is false
+    if @can_retry == false
+      @retry_count = 1
     end
+
+    
+    @retry_count.times do
+    begin
+      response = http.request(request)	
+      case response.code
+	  
+	    # HTTP_SUCCESS :Code 2xx
+	    when HTTP_SUCCESS					
+	      puts "Event send to Loggly"
+		  
+		# HTTP_FORBIDDEN :Code 403
+	    when HTTP_FORBIDDEN					
+	      @logger.warn("User does not have privileges to execute the action.")
+		
+		# HTTP_NOT_FOUND :Code 404
+	    when HTTP_NOT_FOUND					
+	      @logger.warn("Invalid URL. Please check URL should be http://logs-01.loggly.com/inputs/CUSTOMER_TOKEN/tag/logstash")
+	    
+		# HTTP_INTERNAL_SERVER_ERROR :Code 500
+		when HTTP_INTERNAL_SERVER_ERROR			
+	      @logger.warn("Internal Server Error")
+		
+		# HTTP_GATEWAY_TIMEOUT :Code 504
+	    when HTTP_GATEWAY_TIMEOUT				
+	      @logger.warn("Gateway Time Out")
+	    else
+	      @logger.error("Unexpected response code", :code => response.code)
+      end # case
+
+      if [HTTP_SUCCESS,HTTP_FORBIDDEN,HTTP_NOT_FOUND].include?(response.code)	# break the retries loop for the specified response code
+        break
+      end
+	  rescue StandardError => e
+        @logger.error("An unexpected error occurred", :exception => e.class.name, :error => e.to_s, :backtrace => e.backtrace)
+      end # rescue
+     
+      if totalRetries < @retry_count && totalRetries > 0
+        puts "Waiting for five seconds before retry..."
+        sleep(5)
+      end
+	  
+      totalRetries = totalRetries + 1
+    end #loop
   end # def send_event
- 
 end # class LogStash::Outputs::Loggly
-

data/logstash-output-loggly.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-loggly'
-  s.version         = '2.0.2'
+  s.version         = '2.0.3'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Got a loggly account? Use logstash to ship logs to Loggly!"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-loggly
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,34 +28,36 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
 email: info@elastic.co
 executables: []