lumberjack_aziz_light 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ae9171da4a378479133de30af3e891550667e9a
-  data.tar.gz: aa5e35929402d35ecff363c776c8ff2fc1620ab9
+  metadata.gz: 8c13f582284b6e863efb7cb121e413c1aa064da6
+  data.tar.gz: d3d424b0f33b547dd28362374dc6befde889682c
 SHA512:
-  metadata.gz: c92d8d0fb6d685146e00c3bffa0f44abffd7d7834d155409fb82a13645dac65f32d3507d7e71c5a18cced4b4ea3a9b41be17f4f0a0de2c098a6dd00b032c9807
-  data.tar.gz: 65d396ab9d6e02007c0976ed95fc5c942112f7d40dd635a2fcb9bc2b988ff918b4ed8981307db214630ee4b2f2584c280bd6dfb8f9f99e6e6f0d4ad8adac1c5f
+  metadata.gz: 29e68560a8743a2b915fa7820b24c92a505ccbaf9666dbaebde01501e753b10ead2b3f6d347ae17ea5e8d814316611e5db093dab9c2c04f28c2e41b542de9c4e
+  data.tar.gz: 8235405c7cbfb5b0a112d3a4c055f9e0a20184d55dad9d12ff41f278711e685569a97899b818acf4f996173f9773a645c479cc5296365754c14a03ae4f15afed

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/lib/lumberjack/device/date_rolling_log_file.rb

@@ -12,6 +12,7 @@ module Lumberjack
       # with the <tt>:roll</tt> option which may contain a value of <tt>:daily</tt>, <tt>:weekly</tt>,
       # or <tt>:monthly</tt>.
       def initialize(path, options = {})
+        @manual = options[:manual]
         @file_date = Date.today
         if options[:roll] && options[:roll].to_s.match(/(daily)|(weekly)|(monthly)/i)
           @roll_period = $~[0].downcase.to_sym
@@ -34,17 +35,21 @@ module Lumberjack
       end
 
       def roll_file?
-        date = Date.today
-        if date.year > @file_date.year
-          true
-        elsif @roll_period == :daily && date.yday > @file_date.yday
-          true
-        elsif @roll_period == :weekly && date.cweek > @file_date.cweek
-          true
-        elsif @roll_period == :monthly && date.month > @file_date.month
+        if @manual
           true
         else
-          false
+          date = Date.today
+          if date.year > @file_date.year
+            true
+          elsif @roll_period == :daily && date.yday > @file_date.yday
+            true
+          elsif @roll_period == :weekly && date.cweek > @file_date.cweek
+            true
+          elsif @roll_period == :monthly && date.month > @file_date.month
+            true
+          else
+            false
+          end
         end
       end
       

data/lib/lumberjack/device/size_rolling_log_file.rb

@@ -10,6 +10,7 @@ module Lumberjack
       # Create an new log device to the specified file. The maximum size of the log file is specified with
       # the <tt>:max_size</tt> option. The unit can also be specified: "32K", "100M", "2G" are all valid.
       def initialize(path, options = {})
+        @manual = options[:manual]
         @max_size = options[:max_size]
         if @max_size.is_a?(String)
           if @max_size.match(/^(\d+(\.\d+)?)([KMG])?$/i)
@@ -37,7 +38,7 @@ module Lumberjack
       end
 
       def roll_file?
-        stream.stat.size > @max_size
+        @manual || stream.stat.size > @max_size
       rescue SystemCallError => e
         false
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lumberjack_aziz_light
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Brian Durand