corona 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8a730fb90e6e3cb07e7ec195ecac7473a40a2fd
-  data.tar.gz: 3f8d44209ae05c40c6276f6f241a3252842ee4c4
+  metadata.gz: 05542efc8878a1c42874c4a0fb32badca922a9b5
+  data.tar.gz: 0758f35f168258f9c9db2f98eb5855517fbfbbbc
 SHA512:
-  metadata.gz: f44d1f153235dff6f0da01527abde190c4ee2591e2f44ea0e3f08072c653d0928dd156ea1ec065d559955277bd5a5401524eb264c1109948b080cd950977d857
-  data.tar.gz: 010693ac9b69c6691f707ecb8cbe5534a0709413238a95f420ce7ff5cfe5da3ef01df649296075a76099ea0292205113633fce0a0023af822286b8bcbc581695
+  metadata.gz: f47ae73a9939219ea5cb37314d64b5a9c826d6822eef1246f9061a0e97150c8f2ed266aeb2981b87991b30972fcfd1b9241412f2755e78794f4f29900bdfec8c
+  data.tar.gz: 37e81fa4f1bf58cb8867945409b13f498540169a5899a96c94d59af26e3e77143ed9b58dd314bab8d21442bd258993f403804ab9771cc6b27f3e49cbeb4e9bd3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    corona (0.0.9)
+    corona (0.0.10)
       sequel
       slop
       snmp

data/corona.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'corona'
-  s.version           = '0.0.9'
+  s.version           = '0.0.10'
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]
   s.email             = %w( saku@ytti.fi )

data/lib/corona/cli.rb

@@ -8,7 +8,9 @@ module Corona
       if @opts[:poll]
         Corona.new :cidr=>@opts[:poll]
       elsif @opts[:remove]
-        remove_from_db @opts[:remove]
+        remove_records @opts[:remove]
+      elsif @opts['purge-old']
+        remove_old @opts['purge-old']
       else
         Corona.new
       end
@@ -28,16 +30,26 @@ module Corona
         on 'd',  'debug',      'Debugging on'
         on 'p=', 'poll',       'Poll CIDR [argument]'
         on 'r=', 'remove',     'Remove [argument] from DB'
-        on 'm=', 'max-delete', "Maximum number to detel, default #{MAX_DELETE}"
+        on 'm=', 'max-delete', "Maximum number to delete, default #{MAX_DELETE}"
+        on 'o=', 'purge-old',  'Remove records order than [argument] days'
         on 's',  'simulate',   'Simulate, do not change DB'
       end
       [opts.parse!, opts]
     end
 
-    def remove_from_db name
-      max_del = @opts['max-delete'] ? @opts['max-delete'] : MAX_DELETE
+    def remove_records name
+      DB.new
+      delete_records DB::Device.filter(Sequel.like(:ptr, "%#{name}%")).all
+    end
+
+    def remove_old days
+      old = (Time.now.utc - days.to_i * 24 * 60 * 60)
       DB.new
-      devs = DB::Device.filter(Sequel.like(:ptr, "%#{name}%")).all
+      delete_records DB::Device.filter{last_seen < old}.all
+    end
+
+    def delete_records devs
+      max_del = @opts['max-delete'] ? @opts['max-delete'] : MAX_DELETE
       if devs.size > max_del.to_i
         puts 'Too many matching devices:'
         devs.each do |dev|
@@ -52,6 +64,5 @@ module Corona
         end
       end
     end
-
   end
 end

data/lib/corona/core.rb

@@ -19,6 +19,11 @@ module Corona
 
     def initialize opts={}
       cidr          = opts.delete :cidr
+      @output       = opts.delete :output
+      if not @output
+        @output = Logger.new $stdout
+        @output.formatter = proc { |_ ,_ ,_ , msg| msg + "\n" }
+      end
       poll, ignores = resolve_networks cidr
       @mutex        = Mutex.new
       @db           = DB.new
@@ -64,7 +69,7 @@ module Corona
 
       if not old_by_sysname and not old_by_ip
         # all new device
-        puts "ptr [%s] sysName [%s] ip [%s]" % [record[:ptr], record[:oid_sysName], record[:ip]]
+        @output.info "ptr [%s] sysName [%s] ip [%s]" % [record[:ptr], record[:oid_sysName], record[:ip]]
         Log.info "#{record[:ip]} added"
         @db.add record
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: corona
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Saku Ytti