apache-log-geo 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b688bc33811dda59d01daba379846ea91eca0e7b2d125739f0e7f98c327985d6
-  data.tar.gz: 1e69c302666c3b5f38458af38f0a4094f82a9e12fe3f52bd1008a91cac4bae96
+  metadata.gz: 34da9d9d49ed08a9b3c0fc01aafd3051de023dc0632909d804cb4640d5cbff00
+  data.tar.gz: fb5d34390295623bfacfb093f28cd4ccf794dc6bd34f0fb65b4c3f042230f085
 SHA512:
-  metadata.gz: '0184047e4a91342815ddbf89dd4bf0cc2745b4aeb0f6ecb82416d498c9363f46566f0b423d16ac71c60d29f04accef9069ab12590542ecd553491956f96f29cc'
-  data.tar.gz: 3ce1c92a2d35de14ec126193b9196332cdba6a1b67ca173fceaf0483e346ddd7b1b655d9ab0e5c1277b98414e9c69ded4fe06a3500a1cc02c958c8aeaacef707
+  metadata.gz: 1b90aea1bf592f196d8573b41f8e938163d78411c13246847d126f5e231c5653a41614df5168efbccda596ea9f5b122b3fa3e79c1a5d528a88cac70448b81a31
+  data.tar.gz: ff158b0ad399224776055d414c7b84fc52fee9c08ee3b500e20bfa19ecb6ae0d032257487e19d48ee392291381b351ad762394a028757faabfdbae5c8be0c28d

data/README.md

@@ -79,8 +79,8 @@ $ cat test/access.log | ./apache-log-geo --cc 'ie|de' | wc -l
 
 ### mmdb-lookup
 
-Renders the data about ip addresses in json (default) or a suitable
-for a shell script formats:
+Renders data about ip addresses in newline-delimited json (default) or
+in a shell script ready format:
 
 ~~~
 $ ./mmdb-lookup -h
@@ -104,7 +104,7 @@ Kyiv City
 Replicate `apache-log-geo` util--print only the requests from the Irish
 (the example requires `npm -g json`):
 
-    $ cat test/access.log | ./mmdb-lookup | json -c 'this.country_code == "IE"' -a ip | grep -h -f - test/access.log
+    $ cat test/access.log | ./mmdb-lookup | json -g -c 'this.country_code == "IE"' -a ip | grep -h -f - test/access.log
 
 ## Exit status
 

data/apache-log-geo

@@ -54,6 +54,9 @@ rescue
   errx 2, $!
 end
 
+Signal.trap 'SIGINT', sigint_handler
+Signal.trap 'SIGPIPE', sigint_handler
+
 found_anything = false
 $stdin.each_line do |line|
   next if line =~ /^\s*$/

data/lib.rb

@@ -19,6 +19,7 @@ module ApacheLogGeo
   end
 
   def warnx msg; $stderr.puts "#{File.basename $0} warning: #{msg}"; end
+  def sigint_handler; proc {|s| puts ""; exit 128+s }; end
 
   # https://datahub.io/core/country-list
   COUNTRY_CODES = {

data/mmdb-lookup

@@ -5,8 +5,8 @@ require_relative 'lib'
 include ApacheLogGeo
 
 class FMT
-  def initialize input, geo
-    @input = input; @geo = geo
+  def initialize input, geo, callback
+    @input = input; @geo = geo; @cb = method(callback)
     @errors = 0
   end
   attr_accessor :errors
@@ -24,7 +24,7 @@ class FMT
         "#{k}=#{(v.is_a?(Array) ? v.join(',') : v.to_s).shellescape}"
       end
     end
-    r.join "\n"
+    @cb.call r.join "\n"
   end
 
   def json
@@ -36,11 +36,12 @@ class FMT
     end
 
     if @input.is_a?(IO)      # stdin, in which we expect an apache log
-      @input.map { |line| trans.call line.split[0] }.to_json
+      @input.each_line do |line|
+        next if line =~ /^\s*$/
+        @cb.call trans.call(line.split[0]).to_json
+      end
     else                     # argv
-      @input.map do |list|
-        list.split.map { |ip| trans.call ip }
-      end.flatten.to_json
+      @input.map {|ip| @cb.call trans.call(ip).to_json }
     end
   end
 end
@@ -66,6 +67,9 @@ rescue
   errx 2, $!
 end
 
-fmt = FMT.new (ARGV.size > 0 ? ARGV : $stdin), geo
-puts fmt.send opt[:fmt]
+Signal.trap 'SIGINT', sigint_handler
+Signal.trap 'SIGPIPE', sigint_handler
+
+fmt = FMT.new (ARGV.size > 0 ? ARGV : $stdin), geo, :puts
+fmt.send opt[:fmt]
 exit fmt.errors > 0 ? 1 : 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apache-log-geo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Alexander Gromnitsky
 autorequire: 
 bindir: "."
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maxmind-db