le 2.6.2 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c813f3f25ebacaea6556a583b843c4dec615cf7
-  data.tar.gz: bdabbfa54b2cc8a2455a7dee0b45d0c4a9408c69
+  metadata.gz: f868809dc5b8c942e3221ae1dbd81fca04a20c3b
+  data.tar.gz: 8c3ef731110ec76884f561f9d2b1e65ee4442806
 SHA512:
-  metadata.gz: 173661ceff8b521680f1c750d656e884411ef8271e46c490880d50938a3fe55a9e8918e342d633063351199466dfdec4e2cba42f50e2042852a9b69d5470a77e
-  data.tar.gz: 00a8b47741454df48435d42cecb75d3c1af86477773a606abd3e55cd20f28abd86da21d88a5abb55965c2fadae1a48bfe7f14127b1a17af0c3c7672753612f84
+  metadata.gz: d06967717dd86c45f44c22e7ee05158bae3aae779489dab6edb0a90189d13f3475b202cca33a2c515e5623540b991e0bd7d4da851359b55698e31d7da1fa562f
+  data.tar.gz: ca4b927f33ee74afdff3fc350daa35270d63cc96691304cb83a4c7cdb42a69ee03cf53e05330396a3de3c5d62a28825b3d6d9d543bc856d0edafcad75facb925

data/LE.gemspec

@@ -5,7 +5,7 @@ require 'le'
 
 Gem::Specification.new do |gem|
   gem.name	= "le"
-  gem.version	= "2.6.2"
+  gem.version	= "2.7.0"
   gem.date	= Time.now
   gem.summary	= "Logentries plugin"
   gem.licenses    = ["MIT"]

data/lib/le.rb

@@ -22,11 +22,12 @@ module Le
     opt_custom_host = options[:custom_host]             || [false, '']
 
     opt_udp_port = options[:udp_port]                   || nil
+    opt_use_data_endpoint = options[:data_endpoint]     || false
 
     self.checkParams(token, opt_datahub_enabled, opt_udp_port)
 
 
-    host = Le::Host.new(token, opt_local, opt_debug, opt_ssl, opt_datahub_endpoint, opt_host_id, opt_custom_host, opt_udp_port)
+    host = Le::Host.new(token, opt_local, opt_debug, opt_ssl, opt_datahub_endpoint, opt_host_id, opt_custom_host, opt_udp_port, opt_use_data_endpoint)
 
     if defined?(ActiveSupport::TaggedLogging) &&  opt_tag
       logger = ActiveSupport::TaggedLogging.new(Logger.new(host))

data/lib/le/host/http.rb

@@ -8,7 +8,9 @@ module Le
   module Host
     class HTTP
       API_SERVER = 'api.logentries.com'
-
+      DATA_ENDPOINT = 'data.logentries.com'
+      DATA_PORT_UNSECURE = 80
+      DATA_PORT_SECURE = 443
       API_PORT = 10000
       API_SSL_PORT = 20000
       SHUTDOWN_COMMAND = "DIE!DIE!"  # magic command string for async worker to shutdown
@@ -18,10 +20,10 @@ module Le
 
       include Le::Host::InstanceMethods
 #!      attr_accessor :token, :queue, :started, :thread, :conn, :local, :debug, :ssl, :datahub_enabled, :dathub_ip, :datahub_port, :host_id, :custom_host, :host_name_enabled, :host_name
-      attr_accessor :token, :queue, :started, :thread, :conn, :local, :debug, :ssl, :datahub_enabled, :datahub_ip, :datahub_port, :datahub_endpoint, :host_id, :host_name_enabled, :host_name, :custom_host, :udp_port
+      attr_accessor :token, :queue, :started, :thread, :conn, :local, :debug, :ssl, :datahub_enabled, :datahub_ip, :datahub_port, :datahub_endpoint, :host_id, :host_name_enabled, :host_name, :custom_host, :udp_port, :use_datahub_endpoint
 
 
-      def initialize(token, local, debug, ssl, datahub_endpoint, host_id, custom_host, udp_port)
+      def initialize(token, local, debug, ssl, datahub_endpoint, host_id, custom_host, udp_port, use_datahub_endpoint)
           if local
             device = if local.class <= TrueClass
               if defined?(Rails)
@@ -39,6 +41,7 @@ module Le
           @debug= debug
           @ssl = ssl
           @udp_port = udp_port
+          @use_datahub_endpoint = use_datahub_endpoint
 
         @datahub_endpoint = datahub_endpoint
         if !@datahub_endpoint[0].empty?
@@ -163,15 +166,24 @@ module Le
       def openConnection
         dbg "LE: Reopening connection to Logentries API server"
 
-        if @udp_port
-          host = API_SERVER
-          port = @udp_port
-        elsif @datahub_enabled
-          host = @datahub_ip
-          port = @datahub_port
-        else
-          host = API_SERVER
-          port = @ssl ? API_SSL_PORT: API_PORT
+        if @use_datahub_endpoint
+            host = DATA_ENDPOINT
+            if @ssl
+              port = DATA_PORT_SECURE
+            else
+              port = DATA_PORT_UNSECURE
+            end
+        else      
+          if @udp_port
+            host = API_SERVER
+            port = @udp_port
+          elsif @datahub_enabled
+            host = @datahub_ip
+            port = @datahub_port
+          else
+            host = API_SERVER
+            port = @ssl ? API_SSL_PORT: API_PORT
+          end
         end
 
         if @udp_port

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: le
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.7.0
 platform: ruby
 authors:
 - Mark Lacomber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Logentries plugin