file_monitoring 1.0.2 → 1.0.3

data/lib/file_monitoring/file_monitoring.rb

@@ -1,6 +1,6 @@
 require 'algorithms'
 require 'fileutils'
-require 'log'
+require 'log4r'
 require 'params'
 
 require 'file_monitoring/monitor_path'
@@ -41,13 +41,26 @@ module FileMonitoring
         pq.push([priority, elem, dir_stat], -priority)
       }
 
-      log_path = Params['default_monitoring_log_path']
+      #init log4r
+      monitoring_log_path = Params['default_monitoring_log_path']
+      Log.debug1 'File monitoring log: ' + Params['default_monitoring_log_path']
+      monitoring_log_dir = File.dirname(monitoring_log_path)
+      FileUtils.mkdir_p(monitoring_log_dir) unless File.exists?(monitoring_log_dir)
 
-      Log.debug1 'File monitoring log: ' + log_path
-      log_dir = File.dirname(log_path)
-      FileUtils.mkdir_p(log_dir) unless File.exists?(log_dir)
-      log = File.open(log_path, 'w')
-      FileStat.set_log(log)
+      @log4r = Log4r::Logger.new 'BBFS monitoring log'
+      @log4r.trace = true
+      formatter = Log4r::PatternFormatter.new(:pattern => "[%d] [%m]")
+      #file setup
+      file_config = {
+          "filename" => Params['default_monitoring_log_path'],
+          "maxsize" => Params['log_rotation_size'],
+          "trunc" => true
+      }
+      file_outputter = Log4r::RollingFileOutputter.new("monitor_log", file_config)
+      file_outputter.level = Log4r::INFO
+      file_outputter.formatter = formatter
+      @log4r.outputters << file_outputter
+      FileStat.set_log(@log4r)
 
       while true do
         # pull entry that should be checked next,

data/lib/file_monitoring/monitor_path.rb

@@ -32,6 +32,11 @@ module FileMonitoring
     # * <tt>path</tt> - File location
     # * <tt>stable_state</tt> - Number of iterations to move unchanged file to stable state
     def initialize(path, stable_state = DEFAULT_STABLE_STATE)
+      ObjectSpace.define_finalizer(self,
+                                   self.class.method(:finalize).to_proc)
+      if Params['enable_monitoring']
+        Params['process_vars'].inc('obj add FileStat')
+      end
       @path ||= path
       @size = nil
       @creation_time = nil
@@ -42,6 +47,12 @@ module FileMonitoring
       @stable_state = stable_state  # number of iteration to move unchanged file to stable state
     end
 
+    def self.finalize(id)
+      if Params['enable_monitoring']
+        Params['process_vars'].inc('obj rem FileStat')
+      end
+    end
+
     def set_output_queue(event_queue)
       @event_queue = event_queue
     end
@@ -105,8 +116,8 @@ module FileMonitoring
       if (@state != new_state or @state == FileStatEnum::CHANGED)
         @state = new_state
         if (@@log)
-          @@log.puts(cur_stat)
-          @@log.flush  #Ruby1.9.3: note that this is Ruby internal buffering only; the OS may buffer the data as well
+          @@log.info(state + ": " + path)
+          @@log.outputters[0].flush if Params['log_flush_each_message']
         end
         if (!@event_queue.nil?)
           Log.debug1 "Writing to event queue [#{self.state}, #{self.path}]"
@@ -124,13 +135,6 @@ module FileMonitoring
     def to_s (indent = 0)
       (" " * indent) + path.to_s + " : " + state.to_s
     end
-
-    #  Reports current state with identification.
-    #  NOTE This format used by log file.
-    def cur_stat
-      # TODO what output format have to be ?
-      Time.now.utc.to_s + " : " + self.state + " : " + self.path
-    end
   end
 
   #  This class holds current state of directory and methods to control changes
@@ -141,10 +145,23 @@ module FileMonitoring
     # * <tt>path</tt> - File location
     # * <tt>stable_state</tt> - Number of iterations to move unchanged directory to stable state
     def initialize(path, stable_state = DEFAULT_STABLE_STATE)
+      ObjectSpace.define_finalizer(self,
+                                   self.class.method(:finalize).to_proc)
+      if Params['enable_monitoring']
+        Params['process_vars'].inc('obj add DirStat')
+      end
       super
       @dirs = nil
       @files = nil
       @non_utf8_paths = {}
+      ObjectSpace.define_finalizer(self,
+                                   self.class.method(:finalize).to_proc)
+    end
+
+    def self.finalize(id)
+      if Params['enable_monitoring']
+        Params['process_vars'].inc('obj rem DirStat')
+      end
     end
 
     #  Adds directory for monitoring.
@@ -183,10 +200,10 @@ module FileMonitoring
       child_indent = indent + indent_increment
       res = super
       @files.each_value do |file|
-        res += "\n" + file.to_s(child_ident)
+        res += "\n" + file.to_s(child_indent)
       end if @files
       @dirs.each_value do |dir|
-        res += "\n" + dir.to_s(child_ident)
+        res += "\n" + dir.to_s(child_indent)
       end if @dirs
       res
     end

data/lib/file_monitoring/version.rb

@@ -1,3 +1,3 @@
 module FileMonitoring
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: file_monitoring
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: log
+  name: log4r
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: