le 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8106a0e740c344c588e5bfb06acb2d55af4d5437
-  data.tar.gz: 2b9b1ca54e831725a66901b1b08f5b88892dbcd5
+  metadata.gz: 89ee711adf3ed85bc5e76210ee63f1d099431b6c
+  data.tar.gz: 276d832683ea7c659cb1f212b89043379aad50b6
 SHA512:
-  metadata.gz: a013042da9ae780192a3f2808eff3343f0a5072cf2831b79432b1375098903eef6fee9a5da6d27e644ecbcaaa27b036e5e2a79b0bae1334c876623276c295c17
-  data.tar.gz: d5346caa17e4911bbac88de74352dff4eb82781bec50f6410f48cc452824cd1935188c39427132b92fa61184e42c9450cd6203577d202982eb089a5600c8ef03
+  metadata.gz: 8f5e0e09b3647a84205a5d20b0a580348aaed0d0d2fcbb1df54c5aad818175628346ff41beb4798643c76e0521e1487c29951c978cf182b1e165a892c2777bf4
+  data.tar.gz: 7d04ea50400e63f0cd58c3013a25a6ff1905dfc1a11fd0991fc40e93a01742702cfe2e0dde76c81f93106cec5327f4b23884c208da40770dd265a7153cce9795

data/LE.gemspec

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

data/README.md

@@ -23,7 +23,8 @@ Howto
 You must first register your account details with Logentries.
 
 Once you have logged in to Logentries, create a new host with a name of your choice.
-Inside this host, create a new logfile, selecting `Token TCP` as the source type.
+Inside this host, create a new logfile, selecting `Token TCP` (or `Plain TCP/UDP` if using UDP)
+as the source type.
 
 Heroku
 ------
@@ -73,10 +74,14 @@ You can also specify the default level of the logger by adding a :
 
     Rails.logger = Le.new('LOGENTRIES_TOKEN', :log_level => Logger::<level>)
 
-For the `LOGENTRIES_TOKEN` argument, paste the token for the logfile you created earlier in the Logentries UI.
+For the `LOGENTRIES_TOKEN` argument, paste the token for the logfile you created earlier in the Logentries UI or empty string for
+a UDP connection. Additionally, when connecting via UDP, be sure to specify a port using the udp_port parameter:
 
+    Rails.logger = Le.new('', :udp_port => 13287)
 
-Step for setting up DataHub 
+
+
+Step for setting up DataHub
 ---------------------------
 
 **datahub_endpoint - User Defined Array**
@@ -100,7 +105,7 @@ Enter_host_id inside the quotation marks.  Leaving this empty leave the host_id
 
 **custom_host_name - User Defined Array**
 
-custom_host = Array[ true, "mikes_app_server"]         
+custom_host = Array[ true, "mikes_app_server"]
 The 1st parameter is a Boolean value to use the custom host name.
 The 2nd parameter is a String which is the custom_host_name you'd like to assign.  
 

data/lib/le.rb

@@ -20,12 +20,13 @@ module Le
     opt_host_name_enabled = options[:host_name_enabled] || false
     opt_host_name = options[:host_name]                 || ''
     opt_custom_host = options[:custom_host]             || [false, '']
-  
 
-    self.checkParams(token, opt_datahub_enabled)
+    opt_udp_port = options[:udp_port]                   || nil
 
+    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)
+
+    host = Le::Host.new(token, opt_local, opt_debug, opt_ssl, opt_datahub_endpoint, opt_host_id, opt_custom_host, opt_udp_port)
 
     if defined?(ActiveSupport::TaggedLogging) &&  opt_tag
       logger = ActiveSupport::TaggedLogging.new(Logger.new(host))
@@ -42,16 +43,16 @@ module Le
     logger
   end
 
-  def self.checkParams(token, opt_datahub_enabled)
+  def self.checkParams(token, opt_datahub_enabled, opt_udp_port)
     # Check if the key is valid UUID format
 
-    if (!opt_datahub_enabled)  # test Token only when DataHub is not enabled
+    if (!opt_datahub_enabled && !opt_udp_port)  # test Token only when DataHub and UDP are not enabled
       if (token =~ /\A(urn:uuid:)?[\da-f]{8}-([\da-f]{4}-){3}[\da-f]{12}\z/i) == nil
          puts "\nLE: It appears the LOGENTRIES_TOKEN you entered is invalid!\n"
       else
         (token="")
      end
-   end 
+   end
   end
 
 end

data/lib/le/host.rb

@@ -2,9 +2,9 @@ module Le
   module Host
 
 #!    def self.new(token, local, debug, ssl, datahub_enabled, datahub_ip, datahub_port, host_id, host_name_enabled, host_name)
-    def self.new(token, local, debug, ssl, datahub_endpoint, host_id, custom_host)
+    def self.new(token, local, debug, ssl, datahub_endpoint, host_id, custom_host, udp_port)
 
-      Le::Host::HTTP.new(token, local, debug, ssl, datahub_endpoint, host_id, custom_host)
+      Le::Host::HTTP.new(token, local, debug, ssl, datahub_endpoint, host_id, custom_host, udp_port)
     end
 
     module InstanceMethods

data/lib/le/host/http.rb

@@ -50,10 +50,10 @@ S5ol3bQmY1mv78XKkOk=
 
       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
+      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
 
 
-      def initialize(token, local, debug, ssl, datahub_endpoint, host_id, custom_host)
+      def initialize(token, local, debug, ssl, datahub_endpoint, host_id, custom_host, udp_port)
           if local
             device = if local.class <= TrueClass
               if defined?(Rails)
@@ -66,24 +66,25 @@ S5ol3bQmY1mv78XKkOk=
             end
           @logger_console = Logger.new(device)
           end
-        
+
           @local = !!local
-          @debug= debug  
+          @debug= debug
           @ssl = ssl
+          @udp_port = udp_port
 
         @datahub_endpoint = datahub_endpoint
-        if !@datahub_endpoint[0].empty?           
+        if !@datahub_endpoint[0].empty?
           @datahub_enabled=true
           @datahub_ip="#{@datahub_endpoint[0]}"
           @datahub_port=@datahub_endpoint[1]
         else
-          @datahub_enabled=false  
+          @datahub_enabled=false
         end
 
 
         if (@datahub_enabled && @ssl)
           puts ("\n\nYou Cannot have DataHub and SSL enabled at the same time.  Please set SSL value to false in your environment.rb file or used Token-Based logging by leaving the Datahub IP address blank. Exiting application. \n\n")
-          exit 
+          exit
         end
 
 
@@ -93,20 +94,20 @@ S5ol3bQmY1mv78XKkOk=
         else
           @token = ''
 
- #! NOTE THIS @datahub_port conditional MAY NEED TO BE CHANGED IF SSL CAN'T WORK WITH DH        
+ #! NOTE THIS @datahub_port conditional MAY NEED TO BE CHANGED IF SSL CAN'T WORK WITH DH
           @datahub_port = @datahub_port.empty? ?  API_SSL_PORT : datahub_port
           @datahub_ip = datahub_ip
         end
 
         @host_name_enabled=custom_host[0];
         @host_name= custom_host[1];
-         
+
 
 # Check if host_id is empty -- if not assign, if so, make it an empty string.
        if !host_id.empty?
           @host_id = host_id
           @host_id = "host_id=#{host_id}"
-        else  
+        else
           @host_id=''
         end
 
@@ -150,7 +151,7 @@ S5ol3bQmY1mv78XKkOk=
 
       def write(message)
 
-        if !host_id.empty? 
+        if !host_id.empty?
           message = "#{message} #{ host_id }"
         end
 
@@ -163,7 +164,7 @@ S5ol3bQmY1mv78XKkOk=
         end
 
         if message.scan(/\n/).empty?
-          @queue << "#{ @token } #{ message } \n" 
+          @queue << "#{ @token } #{ message } \n"
         else
           @queue << "#{ message.gsub(/^/, "\1#{ @token } [#{ random_message_id }]") }\n"
         end
@@ -195,27 +196,36 @@ S5ol3bQmY1mv78XKkOk=
 
       def openConnection
         dbg "LE: Reopening connection to Logentries API server"
-  
 
-        if !@datahub_enabled
-          port = @ssl ? API_SSL_PORT: API_PORT
-          socket = TCPSocket.new(API_SERVER, port)      
-        else  
+        if @udp_port
+          host = API_SERVER
+          port = @udp_port
+        elsif @datahub_enabled
+          host = @datahub_ip
           port = @datahub_port
-          socket = TCPSocket.new(@datahub_ip, port)
+        else
+          host = API_SERVER
+          port = @ssl ? API_SSL_PORT: API_PORT
         end
 
-         
-        if @ssl
-          ssl_context = OpenSSL::SSL::SSLContext.new()
-          ssl_context.cert = OpenSSL::X509::Certificate.new(API_CERT)
-          ssl_socket = OpenSSL::SSL::SSLSocket.new(socket, ssl_context)
-          ssl_socket.sync_close = true
-          ssl_socket.connect
-          @conn = ssl_socket
+        if @udp_port
+          @conn = UDPSocket.new
+          @conn.connect(host, port)
         else
-          @conn = socket
+          socket = TCPSocket.new(host, port)
+
+          if @ssl
+            ssl_context = OpenSSL::SSL::SSLContext.new()
+            ssl_context.cert = OpenSSL::X509::Certificate.new(API_CERT)
+            ssl_socket = OpenSSL::SSL::SSLSocket.new(socket, ssl_context)
+            ssl_socket.sync_close = true
+            ssl_socket.connect
+            @conn = ssl_socket
+          else
+            @conn = socket
+          end
         end
+
         dbg "LE: Connection established"
       end
 
@@ -265,7 +275,7 @@ S5ol3bQmY1mv78XKkOk=
           loop do
             begin
               @conn.write(data)
-            rescue TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEOUT, EOFError
+            rescue TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, EOFError
               dbg "LE: Connection timeout(#{ $! }), try to reopen connection"
               reopenConnection
               next

data/test/host_spec.rb

@@ -6,13 +6,14 @@ describe Le::Host do
   let(:local)   { false }
   let(:debug)   { false }
   let(:ssl)     { false }
+  let(:udp_port){ nil }
 
   let(:datahub_endpoint) { ["", 10000] }
   let(:host_id) { ""}
   let(:custom_host)	{ [false, ""]}
 
   #let(:host)    { Le::Host.new(token, local, debug, ssl) }
-  let(:host)	{ Le::Host.new(token, local, debug, ssl, datahub_endpoint, host_id, custom_host)}
+  let(:host)	{ Le::Host.new(token, local, debug, ssl, datahub_endpoint, host_id, custom_host, udp_port)}
   specify { host.must_be_instance_of Le::Host::HTTP }
 
 end

data/test/http_spec.rb

@@ -7,14 +7,15 @@ describe Le::Host::HTTP do
   let(:local)              { false }
   let(:debug)              { false }
   let(:ssl)                { false }
+  let(:udp)                { nil }
 
   let(:datahub_endpoint)  { ["", 10000]}
   let(:host_id)           {""}
   let(:custom_host)       {[false, ""]}
-  
+
 
 #  let(:host)               { Le::Host::HTTP.new(token, local, debug, ssl) }
-  let(:host)               { Le::Host::HTTP.new(token, local, debug, ssl, datahub_endpoint, host_id, custom_host) }
+  let(:host)               { Le::Host::HTTP.new(token, local, debug, ssl, datahub_endpoint, host_id, custom_host, udp) }
 
   let(:logger_console)     { host.instance_variable_get(:@logger_console) }
   let(:logger_console_dev) { logger_console.instance_variable_get(:@logdev).dev }
@@ -23,7 +24,8 @@ describe Le::Host::HTTP do
   specify { host.local.must_equal false }
   specify { host.debug.must_equal false }
   specify { host.ssl.must_equal false }
+  specify { host.udp_port.must_equal nil }
   specify {host_id.must_equal ""}
-  specify {custom_host.must_equal [false, ""]}  
+  specify {custom_host.must_equal [false, ""]}
 
 end

data/test/le_spec.rb

@@ -59,7 +59,7 @@ describe Le do
       end
 
       describe "File" do
-        let(:log_file) { File.new(local_test_log) }
+        let(:log_file) { File.new(local_test_log, 'w') }
 
         specify { logdev.must_be_instance_of Le::Host::HTTP }
         specify { logdev.local.must_equal true }
@@ -126,7 +126,7 @@ describe Le do
       end
 
       describe "File" do
-        let(:log_file) { File.new(local_test_log) }
+        let(:log_file) { File.new(local_test_log, 'w') }
 
         specify { logdev.must_be_instance_of Le::Host::HTTP }
         specify { logdev.local.must_equal true }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: le
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Mark Lacomber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler