fluent-plugin-filter-geoip 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 592c7a6c492a234c331d225cf58de2d35c669a03
-  data.tar.gz: b59b98a1889229052058739831f17ce4516df099
+  metadata.gz: cde3b38a6cf1ea9399cb57f3ee6a9eb55605b076
+  data.tar.gz: ed00a25b45352a8cb794a1fff40652032b1a696e
 SHA512:
-  metadata.gz: d723fa0a431a2eb320b59d5012e72153ab6e59786422411c965dbfc7e43a5f566663b437eaf660caa9d30f5ad5798888aa545c04538a7d4054fbf96d0c616292
-  data.tar.gz: 72919a44209008f6fb1d5ca9bf7bf58fadb5f1ce5827dd87f73a89082f318096bde0da9b0409748d9ba42f9167e4cdc271f257b78ad83a1a72d9dc71eb697cf3
+  metadata.gz: 61bc3096df8b34e6cb7dcf231585d6f05156661308a93a81ec9ff8bfbbf6507c48d95915c9a23f90ea7ea83365e5a9e844805dc06dc0cf71c7428257c732af97
+  data.tar.gz: a368fc420027c2a042abe628abab572d7fc9874e3befbc1bdbb09577cbb8baacd8892fcfde4266a6fa5e3e72960feceb9eda31d290f0121edcdf5b5897729934

data/fluent-plugin-filter-geoip.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-filter-geoip"
-  spec.version       = "0.2.3"
+  spec.version       = "0.2.4"
   spec.authors       = ["Minoru Osuka"]
   spec.email         = ["minoru.osuka@gmail.com"]
 

data/lib/fluent/plugin/filter_geoip.rb

@@ -262,8 +262,8 @@ module Fluent
 
     def download_database(download_url, md5_url, database_path, md5_path)
       # database directory
-      database_dir = File.expand_path(File.dirname(database_path))
-      md5_dir = File.expand_path(File.dirname(md5_path))
+      database_dir = File.dirname database_path
+      md5_dir = File.dirname md5_path
 
       # create database directory if directory does not exist.
       FileUtils.mkdir_p(database_dir) unless File.exist?(database_dir)
@@ -273,11 +273,12 @@ module Fluent
       File.open(md5_path, 'wb').close() unless File.exist?(md5_path)
 
       # read saved md5
-      saved_md5 = nil
+      current_md5 = nil
       begin
         open(md5_path, 'rb') do |data|
-          saved_md5 = data.read
+          current_md5 = data.read
         end
+        log.info "Current MD5: %s" % current_md5
       rescue => e
         log.warn e.message
       end
@@ -288,20 +289,23 @@ module Fluent
         open(md5_url, 'rb') do |data|
           fetched_md5 = data.read
         end
+        log.info "Fetched MD5: %s" % fetched_md5
       rescue => e
         log.warn e.message
       end
 
       # check md5
-      unless saved_md5 == fetched_md5 then
+      unless current_md5 == fetched_md5 then
         # download new database
         download_path = database_dir + '/' + File.basename(download_url)
         begin
+          log.info "Download: %s" % download_url
           open(download_path, 'wb') do |output|
             open(download_url, 'rb') do |data|
               output.write(data.read)
             end
           end
+          log.info "Download done: %s" % download_path
         rescue => e
           log.warn e.message
         end
@@ -309,22 +313,31 @@ module Fluent
         # unzip new database temporaly
         tmp_database_path = database_dir + '/tmp_' + File.basename(database_path)
         begin
+          log.info "Unzip: %s" % download_path
           open(tmp_database_path, 'wb') do |output|
             Zlib::GzipReader.open(download_path) do |gz|
               output.write(gz.read)
             end
           end
+          log.info "Unzip done: %s" % tmp_database_path
         rescue => e
           puts e.message
         end
 
         # check mkd5
         temp_md5 = Digest::MD5.hexdigest(File.open(tmp_database_path, 'rb').read)
+        log.info "New MD5: %s" % temp_md5
         if fetched_md5 == temp_md5 then
+          log.info "Rename: %s to %s" % [tmp_database_path, database_path]
           FileUtils.mv(tmp_database_path, database_path)
+          log.info "Rename done: %s to %s" % [tmp_database_path, database_path]
 
           # record new md5
+          log.info "Save: %s" % md5_path
           File.write(md5_path, fetched_md5)
+          log.info "Save done: %s" % md5_path
+        else
+          log.info "MD5 missmatch: Fetched MD5 (%s) != New MD5 (%s) ; " % [fetched_md5, temp_md5]
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-filter-geoip
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Minoru Osuka