logfile_transfer 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8bf080556de88f58167ed2b06e1820c8a1fa724
-  data.tar.gz: a35f906e370c145bd4adef7ead108c8a303f6bff
+  metadata.gz: 3ac71114954c7a8cd25b9e6bf11cda8e9ec8984e
+  data.tar.gz: aea3c02e64fb1f75454043f4c1d3bf03c7f07465
 SHA512:
-  metadata.gz: ac6762871ba5c5973da298493d375287bfb08a63c44ca9efcdcd91dbd5dec218bbe6d4e7b4fe2ada7dab047272b6b6780a8f44eba5b1a44e14292ae72755d9df
-  data.tar.gz: 340f3498d6f435639debea4d3cdb8beb1e81b32320b4d209d0ab699906622ccc7c99ddc6c29499187ec5cfbdb5e9ece6ac5b22a1fa2701cc605ba106ba8313df
+  metadata.gz: 403844f1fe4057b15a4152247a46d757f44e89d97acc7bbe1348371c42c9f55a72254cd01b9e225cf233aaa75492dcc4b72c5dfeb9ef7f60bad5dda0cbe87af1
+  data.tar.gz: dd36c3974ce7d53b7e9fd04b4ef75efa5bce9566b44eb834e62bf2dac7806088c114a3b97516b15677c6b284da625d4a6202b343c20807e065d4566dac56421a

data/README.md

@@ -27,8 +27,8 @@ Ruby monitoring and transform logfiles daemon.
 
     end
 
-    # The daemon binding on port 2001, make it different in other daemon
-    LogfileTransfer.run ARGV, 2001, File.expand_path(File.dirname(__FILE__))
+    # The daemon binding on port 2000, make it different in other daemon
+    LogfileTransfer.run ARGV, 2000, File.expand_path(File.dirname(__FILE__))
 
 ### Edit config.yaml
 
@@ -91,7 +91,7 @@ Ruby monitoring and transform logfiles daemon.
 
     end
 
-    LogfileTransfer.run ARGV, 2001, File.expand_path(File.dirname(__FILE__))
+    LogfileTransfer.run ARGV, 2000, File.expand_path(File.dirname(__FILE__))
 
 ### Edit config.yaml
 

data/example.rb

@@ -1,4 +1,7 @@
-# encoding: utf-8
+#!/usr/bin/env ruby
+# coding: utf-8
+
+require 'rubygems'
 
 lib_dir = File.join File.dirname(__FILE__), 'lib'
 $:.unshift lib_dir unless $:.include? lib_dir
@@ -31,4 +34,4 @@ class Test1 < LogfileTransfer::Handler
 
 end
 
-LogfileTransfer.run ARGV, 2001, File.expand_path(File.dirname(__FILE__))
+LogfileTransfer.run ARGV, 2000, File.expand_path(File.dirname(__FILE__))

data/lib/logfile_transfer.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+#!/usr/bin/env ruby
+# coding: utf-8
 
 require 'file-monitor'
 require 'socket'
@@ -13,7 +14,7 @@ module LogfileTransfer
   PROMPT_NO_RUNNING = 'daemon no running.'
 
   @hostname = 'localhost'
-  @port = 2001
+  @port = 0
   @files = {}
   @threads = []
   @daemon_log_file_name = 'daemon.log'
@@ -66,30 +67,20 @@ module LogfileTransfer
 
     true
   rescue =>e
-    # puts "#{e}"
     false
   ensure  
-    s.close unless s==nil
+    s.close if s
   end
 
   def self.close_files curr_time = 0
-    if curr_time == 0
-      # puts 'close all of files'
-      @files.each do |log_file_name, log_files|
+    @files.delete_if do |log_file_name, log_files|
+      if (curr_time - log_files[2]) > 86400
+        log "close #{log_file_name}"
         log_files[0].close
         log_files[1].close
-      end
-      # puts 'empty file map'
-      @files = {}
-      @daemon_log_file.close
-    else
-      @files.each do |k, v|
-        if (curr_time - v[2]) > 86400
-          puts "close #{k}"
-          v[0].close
-          v[1].close
-          @files[k] = []
-        end
+        true
+      else
+        false
       end
     end
   end
@@ -166,7 +157,7 @@ module LogfileTransfer
         log "pattern: #{pattern}"
         handlers.each do |handler|
           handler.init
-          log "- -#{handler.class} initialized."
+          log "- - #{handler.class} initialized."
         end
       end
 
@@ -204,7 +195,6 @@ module LogfileTransfer
 
           log "#{obj.absolute_path} file monitor thread exit."
         rescue =>err
-          # puts err
           log err
         end
       end
@@ -233,7 +223,6 @@ module LogfileTransfer
             system "unlink #{absolute_path}/#{STOP_CMD_FILE_NAME}"
           end
 
-          # puts 'client.close'
           client.close
 
           break;
@@ -246,18 +235,13 @@ module LogfileTransfer
           end
         end
 
-        # puts 'client.close'
         client.close
       end
 
       close_files
-      # @files.each do |k, v|
-      #   puts "#{k}: #{v}"
-      # end
-      unless server == nil
-        # puts 'server.close'
-        server.close
-      end
+      @daemon_log_file.close
+      log 'server.close'
+      server.close
     end
 
     @threads.each { |t| t.join }
@@ -272,7 +256,6 @@ module LogfileTransfer
     end
 
     cmd = argv[0]
-    # puts "cmd: #{cmd}"
 
     @exit_flag = false;
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logfile_transfer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Cong Yan
@@ -46,7 +46,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='