stackify-ruby-apm 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bd379b0656760e155c8796bf1774627e593ecbe
-  data.tar.gz: cb1f771b879d3c21dafc339e7f1cb874f592f9fb
+  metadata.gz: 1b769d0f8ea6c9ec534a343fb2db63c355857cd0
+  data.tar.gz: a670f3472367c5d18abb2d73ab5a7bf6c53c3414
 SHA512:
-  metadata.gz: be773012e733b98d520a0605f9a6fe85f79a06feddfda47046479929eba89b161a50528e0bc8188717ad2d5004fc236b71f720941f78378baeb74ae87f0f564f
-  data.tar.gz: bae740a96d52bd9905af652998a3f5440f836028e1d000684e496ea37f5fd8b0c50e9f752b02ada9b84e341a6fcd2f44c9409d7efc96e6f26b627d9d9630b0a5
+  metadata.gz: 255d6443ed6fc90b60bebce9282807d988b746fb2b3a08b5b1748f4db5aa6a84834561c29bc8182d0bfb32a963836cb546a6087fcbeeef96a6a39f86e7d50720
+  data.tar.gz: fb3beadebaf884ddcacf61a34701e5cfc86177f067ec9e9956ef2d6de5db3e8ef49fdea9df24922c1d5470c081c3f18e7162bd82d4ae8abb6dd6ebd2e5510df8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stackify-ruby-apm (1.0.0)
+    stackify-ruby-apm (1.0.1)
       concurrent-ruby (~> 1.0)
       delegate_matcher (~> 0.4)
 

data/lib/stackify/logger/log_device.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+# Starts the Monkey patch for the generated log by not including the header
+#
+#
+# @param file
+# @removed the header of the generated log
+module StackifyRubyAPM
+  # @api private
+  class LogDevice < Logger::LogDevice
+    def add_log_header(file)
+      # Make it only empty.
+    end
+
+    # This is the monkeypatch of core Logger method where reformats when shifting log age the filename when creating the file log.
+
+    # rubocop:disable Style/RescueModifier
+    # rubocop:disable Lint/RescueWithoutErrorClass
+    # Newly created file example <file>-2.log is the latest appended log
+    def shift_log_age
+      # set a temporary filename that doesn't have the increment prefix and .log format.
+      temp_filename = @filename.gsub(/\-(d*\.?\d*).log/, '')
+      # set a temporary file increment while stripping the current filename and retain the number
+      txttemp_fileincrement = @filename.gsub(temp_filename,'')
+      txttemp_fileincrement = txttemp_fileincrement.gsub('-','')
+      txttemp_fileincrement = txttemp_fileincrement.gsub('.log','')
+
+      # convert the string value to integer
+      current_fileprefix = txttemp_fileincrement.to_i
+      # assign as filename counter
+      filename_counter = current_fileprefix
+      if FileTest.exist?(@filename)
+        filename_counter = current_fileprefix + 1
+      else
+        ctr_flagger = 0
+        # a loop that check if the number of filenames if exists or not 
+        (1).upto(current_fileprefix) do |i|
+          temp_oldfile = "#{temp_filename}-#{i}.log"
+          ctr_flagger = ctr_flagger + 1 if FileTest.exist?(temp_oldfile)
+        end
+        # if the counter is 0 then set the filename counter to 1        
+        filename_counter = 1 if ctr_flagger < 0
+      end
+
+      @dev.close rescue nil
+
+      temp_newfilename = "#{temp_filename}-#{filename_counter}.log"
+      @filename = temp_newfilename
+      @dev = create_logfile(@filename)
+
+      true
+    end
+
+    #  This is the monkeypatch of core Logger method where reformats the file name when creating the file log.
+    def shift_log_period(period_end)
+      puts "shift_log_period(period_end) mao ni"
+
+      suffix = period_end.strftime(@shift_period_suffix)
+      age_file = "#{@filename}.#{suffix}"
+      if FileTest.exist?(age_file)
+        # try to avoid filename crash caused by Timestamp change.
+        idx = 1
+        # .99 can be overridden; avoid too much file search with 'loop do'
+        while idx < 100
+          idx += 1
+          age_file = "#{@filename}-#{idx}.#{suffix}"
+          break unless FileTest.exist?(age_file)
+        end
+      end
+      @dev.close rescue nil
+      File.rename(@filename.to_s, age_file)
+      @dev = create_logfile(@filename)
+
+      true
+    end
+    # rubocop:enable Style/RescueModifier
+    # rubocop:enable Lint/RescueWithoutErrorClass
+  end
+end

data/lib/stackify/logger/logger_high_version.rb

@@ -1,65 +1,39 @@
+# frozen_string_literal: true
+
 # Starts the Monkey patch for the generated log by not including the header
 #
+#
 # @param file
 # @removed the header of the generated log
 module StackifyRubyAPM
-
+  # @api private
   class StackifyLogger < Logger
-
+    # rubocop:disable Style/NumericLiterals
+    # rubocop:disable Style/GuardClause
+    # rubocop:disable Metrics/ParameterLists
+    # rubocop:disable Lint/UnusedMethodArgument
     def initialize(logdev, shift_age = 0, shift_size = 1048576, level: DEBUG,
-      progname: nil, formatter: nil, datetime_format: nil,
-      shift_period_suffix: '%Y%m%d')
+                   progname: nil, formatter: nil, datetime_format: nil,
+                   shift_period_suffix: '%Y%m%d')
       super(nil) # this prevents it from initializing a LogDevice
       @logdev = nil
       if logdev
         new_logdev = logdev
-        if (logdev.instance_of? String)
-          temp_filename = logdev.gsub(".log", "")
-          new_logdev = temp_filename + "-1.log"
+        if logdev.instance_of? String
+          temp_filename = logdev.gsub('.log', '')
+          new_logdev = temp_filename + '-1.log'
         end
-
-        @logdev = LogDevice.new(new_logdev, :shift_age => shift_age,
-        :shift_size => shift_size,
-        :shift_period_suffix => shift_period_suffix)
+        @logdev = LogDevice.new(new_logdev, shift_age: shift_age,
+                                            shift_size: shift_size,
+                                            shift_period_suffix: shift_period_suffix)
       end
     end
-    class LogDevice < Logger::LogDevice
-      def add_log_header(file)
-      end
-      # This is the monkeypatch of core Logger method where reformats when shifting log age the filename when creating the file log.
-      def shift_log_age
-        temp_filename = @filename.gsub(/\-([0-9]).log/,"")
-        (@shift_age-1).downto(2) do |i|
-          if FileTest.exist?("#{temp_filename}-#{i}.log")
-            File.rename("#{temp_filename}-#{i}.log", "#{temp_filename}-#{i+1}.log")
-          end
-        end
-        @dev.close rescue nil
-        File.rename("#{temp_filename}-1.log", "#{temp_filename}-2.log")
-        @dev = create_logfile(@filename)
+    require 'stackify/logger/log_device'
+    # rubocop:enable Style/NumericLiterals
+    # rubocop:enable Style/GuardClause
+    # rubocop:enable Metrics/ParameterLists
+    # rubocop:enable Lint/UnusedMethodArgument
 
-        return true
-      end
-      #  This is the monkeypatch of core Logger method where reformats the file name when creating the file log.
-      def shift_log_period(period_end)
-        suffix = period_end.strftime(@shift_period_suffix)
-        age_file = "#{@filename}.#{suffix}"
-        if FileTest.exist?(age_file)
-          # try to avoid filename crash caused by Timestamp change.
-          idx = 1
-          # .99 can be overridden; avoid too much file search with 'loop do'
-          while idx < 100
-            idx += 1
-            age_file = "#{@filename}-#{idx}.#{suffix}"
-            break unless FileTest.exist?(age_file)
-          end
-        end
-        @dev.close rescue nil
-        File.rename("#{@filename}", age_file)
-        @dev = create_logfile(@filename)
 
-        return true
-      end
-    end
   end
-end
+end

data/lib/stackify/logger/logger_lower_version.rb

@@ -1,63 +1,28 @@
+# frozen_string_literal: true
+
 # Starts the Monkey patch for the generated log by not including the header
 #
+#
 # @param file
 # @removed the header of the generated log
 module StackifyRubyAPM
+  # @api private
   class StackifyLogger < Logger
-
+    # rubocop:disable Style/NumericLiterals
+    # rubocop:disable Style/GuardClause
     def initialize(logdev, shift_age = 0, shift_size = 1048576)
       super(nil) # this prevents it from initializing a LogDevice
       @logdev = nil
       if logdev
         new_logdev = logdev
-        if (logdev.instance_of? String)
-          temp_filename = logdev.gsub(".log", "")
-          new_logdev = temp_filename + "-1.log"
+        if logdev.instance_of? String
+          temp_filename = logdev.gsub('.log', '')
+          new_logdev = temp_filename + '-1.log'
         end
-
-        @logdev = LogDevice.new(new_logdev, :shift_age => shift_age,
-          :shift_size => shift_size)
-      end
-    end
-
-    class LogDevice < Logger::LogDevice
-      
-      def add_log_header(file)
-      end
-      # This is the monkeypatch of core Logger method where reformats when shifting log age the filename when creating the file log.
-      def shift_log_age
-        temp_filename = @filename.gsub(/\-([0-9]).log/,"")
-        (@shift_age-1).downto(2) do |i|
-          if FileTest.exist?("#{temp_filename}-#{i}.log")
-            File.rename("#{temp_filename}-#{i}.log", "#{temp_filename}-#{i+1}.log")
-          end
-        end
-        @dev.close rescue nil
-        File.rename("#{temp_filename}-1.log", "#{temp_filename}-2.log")
-        @dev = create_logfile(@filename)
-
-        return true
-      end
-      #  This is the monkeypatch of core Logger method where reformats the file name when creating the file log.
-      def shift_log_period(period_end)
-        suffix = period_end.strftime(@shift_period_suffix)
-        age_file = "#{@filename}.#{suffix}"
-        if FileTest.exist?(age_file)
-          # try to avoid filename crash caused by Timestamp change.
-          idx = 1
-          # .99 can be overridden; avoid too much file search with 'loop do'
-          while idx < 100
-            idx += 1
-            age_file = "#{@filename}-#{idx}.#{suffix}"
-            break unless FileTest.exist?(age_file)
-          end
-        end
-        @dev.close rescue nil
-        File.rename("#{@filename}", age_file)
-        @dev = create_logfile(@filename)
-
-        return true
+        @logdev = LogDevice.new(new_logdev, shift_age: shift_age,
+                                            shift_size: shift_size)
       end
     end
+    require 'stackify/logger/log_device'
   end
-end
+end

data/lib/stackify/version.rb

@@ -1,4 +1,4 @@
 # Sets the version of the APM
 module StackifyRubyAPM
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-ruby-apm
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,6 +111,7 @@ files:
 - lib/stackify/instrumenter.rb
 - lib/stackify/internal_error.rb
 - lib/stackify/log.rb
+- lib/stackify/logger/log_device.rb
 - lib/stackify/logger/logger_high_version.rb
 - lib/stackify/logger/logger_lower_version.rb
 - lib/stackify/middleware.rb