cloudwatchlogger 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6ca7c28dbaa9d4cd65eb71b0fbfae51d8e1933a
-  data.tar.gz: 434c182d0862b63b6ab7d0c8ac6a020def97ceb5
+  metadata.gz: fb1e357bd158f76606d1e13a03ed520f6dead066
+  data.tar.gz: 4dd0d17ac08f99ff207519b1b9e5ad7c0120cc8d
 SHA512:
-  metadata.gz: cc7ed35ff37a17bd5a73effbd298ec14f7585a37a215254591efb7b982b3bf6bcd0b5fcab2760c0a315c58147f1e29667973e6b21ff5cf72f9c6826dfe90f9df
-  data.tar.gz: b4fdd61589e900f84a528c7ae58de745e9642e48891cb5c73545fd8638507c9fd313dd551c9018d4d8839782727163b72c02a3573210631bd424c4f5a0abd106
+  metadata.gz: 9ae37a40c94f7f2b7b82702ff319d3511dc0baf64e70e095b2bfd2cfaf37bb06955dd083426cb068412f1dcdfc560b65ef586c4d50243ea902792162eb11ec59
+  data.tar.gz: e0c060b9ec7d9001a450b0da9d611e7d1bd1c77cf70278e32f38c646c64effe4dd7bdb997dfec03dfbc1603d878f20b642b243fefe177d9e37e5a85081f1dc67

data/README.md

@@ -80,6 +80,11 @@ Will produce the following log message in CloudWatch Logs:
 "<Date> severity=WARN, boom=box, bar=soap"
 ```
 
+Releasing
+-----
+
+`rake release`
+
 Bugs
 -----
 

data/lib/cloudwatchlogger.rb

@@ -3,11 +3,10 @@ require File.join(File.dirname(__FILE__), 'cloudwatchlogger', 'client')
 require 'logger'
 
 module CloudWatchLogger
-
   class LogGroupNameRequired < ArgumentError; end
   class LogEventRejected < ArgumentError; end
 
-  def self.new(credentials, log_group_name, log_stream_name=nil, opts={})
+  def self.new(credentials, log_group_name, log_stream_name = nil, opts = {})
     client = CloudWatchLogger::Client.new(credentials, log_group_name, log_stream_name, opts)
     logger = Logger.new(client)
 
@@ -19,5 +18,4 @@ module CloudWatchLogger
 
     logger
   end
-
-end
+end

data/lib/cloudwatchlogger/client.rb

@@ -5,44 +5,42 @@ require 'uuid'
 
 module CloudWatchLogger
   module Client
-
-    def self.new(credentials, log_group_name, log_stream_name=nil, opts={})
+    def self.new(credentials, log_group_name, log_stream_name = nil, opts = {})
       unless log_group_name
-        raise LogGroupNameRequired.new
+        raise LogGroupNameRequired, 'log_group_name is required'
       end
 
       CloudWatchLogger::Client::AWS_SDK.new(credentials, log_group_name, log_stream_name, opts)
     end
 
     module InstanceMethods
-
-      def masherize_key(prefix,key)
-        [prefix,key.to_s].compact.join('.')
+      def masherize_key(prefix, key)
+        [prefix, key.to_s].compact.join('.')
       end
 
-      def masher(hash, prefix=nil)
+      def masher(hash, prefix = nil)
         hash.map do |v|
           if v[1].is_a?(Hash)
-            masher(v[1],masherize_key(prefix,v[0]))
+            masher(v[1], masherize_key(prefix, v[0]))
           else
-            "#{masherize_key(prefix,v[0])}=" << case v[1]
-            when Symbol
-              v[1].to_s
-            else
-              v[1].inspect
-            end
+            "#{masherize_key(prefix, v[0])}=" << case v[1]
+                                                 when Symbol
+                                                   v[1].to_s
+                                                 else
+                                                   v[1].inspect
+                                                 end
           end
-        end.join(", ")
+        end.join(', ')
       end
 
       def formatter
         proc do |severity, datetime, progname, msg|
-          processid=Process.pid
+          processid = Process.pid
           if @format == :json && msg.is_a?(Hash)
-            MultiJson.dump(msg.merge({ :severity => severity,
-                                       :datetime => datetime,
-                                       :progname => progname,
-                                       :pid      => processid }))
+            MultiJson.dump(msg.merge(severity: severity,
+                                     datetime: datetime,
+                                     progname: progname,
+                                     pid: processid))
           else
             message = "#{datetime} "
             message << massage_message(msg, severity, processid)
@@ -51,18 +49,18 @@ module CloudWatchLogger
       end
 
       def massage_message(incoming_message, severity, processid)
-        outgoing_message = ""
-        
+        outgoing_message = ''
+
         outgoing_message << "pid=#{processid}, thread=#{Thread.current.object_id}, severity=#{severity}, "
-        
-        case incoming_message
-        when Hash
-          outgoing_message << masher(incoming_message)
-        when String
-          outgoing_message << incoming_message
-        else
-          outgoing_message << incoming_message.inspect
-        end
+
+        outgoing_message << case incoming_message
+                            when Hash
+                              masher(incoming_message)
+                            when String
+                              incoming_message
+                            else
+                              incoming_message.inspect
+                            end
         outgoing_message
       end
 
@@ -73,18 +71,17 @@ module CloudWatchLogger
       def setup_log_group_name(name)
         @log_group_name = name
       end
-      
+
       def setup_log_stream_name(name)
-        @log_stream_name = name
-        if @log_stream_name.nil?
-          uuid = UUID.new
-          @log_stream_name = "#{Socket.gethostname}-#{uuid.generate}"
-        end
+        @log_stream_name = name || default_log_stream_name
       end
 
+      def default_log_stream_name
+        uuid = UUID.new
+        @log_stream_name ||= "#{Socket.gethostname}-#{uuid.generate}"
+      end
     end
-
   end
 end
 
-require File.join(File.dirname(__FILE__), 'client', 'aws_sdk')
+require File.join(File.dirname(__FILE__), 'client', 'aws_sdk')

data/lib/cloudwatchlogger/client/aws_sdk.rb

@@ -7,7 +7,7 @@ module CloudWatchLogger
 
       attr_reader :input_uri, :deliverer
 
-      def initialize(credentials, log_group_name, log_stream_name, opts={})
+      def initialize(credentials, log_group_name, log_stream_name, opts = {})
         setup_credentials(credentials)
         setup_log_group_name(log_group_name)
         setup_log_stream_name(log_stream_name)
@@ -23,4 +23,4 @@ module CloudWatchLogger
       end
     end
   end
-end
+end

data/lib/cloudwatchlogger/client/aws_sdk/threaded.rb

@@ -4,13 +4,15 @@ require 'thread'
 module CloudWatchLogger
   module Client
     class AWS_SDK
-
       # Used by the Threaded client to manage the delivery thread
       # recreating it if is lost due to a fork.
       #
       class DeliveryThreadManager
-        def initialize(credentials, log_group_name, log_stream_name, opts={})
-          @credentials, @log_group_name, @log_stream_name, @opts = credentials, log_group_name, log_stream_name, opts
+        def initialize(credentials, log_group_name, log_stream_name, opts = {})
+          @credentials = credentials
+          @log_group_name = log_group_name
+          @log_stream_name = log_stream_name
+          @opts = opts
           start_thread
         end
 
@@ -18,9 +20,9 @@ module CloudWatchLogger
         def deliver(message)
           start_thread unless @thread.alive?
           @thread.deliver(message)
-          #Race condition? Sometimes we need to rescue this and start a new thread
+          # Race condition? Sometimes we need to rescue this and start a new thread
         rescue NoMethodError
-          @thread.kill #Try not to leak threads, should already be dead anyway
+          @thread.kill # Try not to leak threads, should already be dead anyway
           start_thread
           retry
         end
@@ -33,21 +35,20 @@ module CloudWatchLogger
       end
 
       class DeliveryThread < Thread
-
-        def initialize(credentials, log_group_name, log_stream_name, opts={})
-          @credentials, @log_group_name, @log_stream_name, @opts = credentials, log_group_name, log_stream_name, opts
+        def initialize(credentials, log_group_name, log_stream_name, opts = {})
           opts[:open_timeout] = opts[:open_timeout] || 120
           opts[:read_timeout] = opts[:read_timeout] || 120
+          @credentials = credentials
+          @log_group_name = log_group_name
+          @log_stream_name = log_stream_name
+          @opts = opts
 
           @queue = Queue.new
           @exiting = false
 
           super do
             loop do
-
-              if @client.nil?
-                connect! opts
-              end
+              connect!(opts) if @client.nil?
 
               msg = @queue.pop
               break if msg == :__delivery_thread_exit_signal__
@@ -57,14 +58,11 @@ module CloudWatchLogger
                   log_group_name: @log_group_name,
                   log_stream_name: @log_stream_name,
                   log_events: [{
-                    timestamp: (Time.now.utc.to_f.round(3)*1000).to_i,
+                    timestamp: (Time.now.utc.to_f.round(3) * 1000).to_i,
                     message: msg
                   }]
                 }
-
-                if token = @sequence_token
-                  event[:sequence_token] = token
-                end
+                event[:sequence_token] = @sequence_token if @sequence_token
                 response = @client.put_log_events(event)
                 unless response.rejected_log_events_info.nil?
                   raise CloudWatchLogger::LogEventRejected
@@ -77,10 +75,10 @@ module CloudWatchLogger
             end
           end
 
-          at_exit {
+          at_exit do
             exit!
             join
-          }
+          end
         end
 
         # Signals the queue that we're exiting
@@ -94,7 +92,7 @@ module CloudWatchLogger
           @queue.push(message)
         end
 
-        def connect!(opts={})
+        def connect!(opts = {})
           @client = Aws::CloudWatchLogs::Client.new(
             region: @opts[:region] || 'us-east-1',
             access_key_id: @credentials[:access_key_id],
@@ -107,16 +105,15 @@ module CloudWatchLogger
               log_group_name: @log_group_name,
               log_stream_name: @log_stream_name
             )
-          rescue Aws::CloudWatchLogs::Errors::ResourceNotFoundException => err
+          rescue Aws::CloudWatchLogs::Errors::ResourceNotFoundException
             @client.create_log_group(
               log_group_name: @log_group_name
             )
             retry
-          rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => err
+          rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException
           end
         end
       end
-
     end
   end
 end

data/lib/cloudwatchlogger/version.rb

@@ -1,5 +1,3 @@
 module CloudWatchLogger
-
-  VERSION = '0.2.0'
-
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudwatchlogger
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Zane Shannon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid