txcatcher 0.1.74 → 0.1.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92936b57477c0542131d557f44821198ccf5c457
-  data.tar.gz: 4386bca28f25372e778571847f0fb01e37f5bea0
+  metadata.gz: 9b7dc3ae4c6fd912e914dd8f96cfd7dee17070d6
+  data.tar.gz: 698dfaee6449d7d24a19f72ce59de0fb472f8a27
 SHA512:
-  metadata.gz: 1ead00c396df098d2d36adda908fd3b65726362a02f0a1ec626359e63e5759fb704bed8fc35716a5b2ef489de6388edb48a809b267bea8c986cecd98915ec8a7
-  data.tar.gz: 64c0a5ee8ad9a0b2fe75d830b796b75eef9c59273edf7238b2d2cbda5e429c7a75c2905f110800fba20411ea41701cecd3dfc2cf83215671f0170d77b5e9db35
+  metadata.gz: a0e8283e22af52664c2a6b9ae46f77f4447d6cd2a322dc54fe28a2cb9f542419381270b8dc6c7f239abbde81dd5e6d1de6ee683df6d7a4214c9d3043c41f8373
+  data.tar.gz: 20029f87d61dab8a0443441986606f624483216ce03624158685d1226c6e7bcd56433a76abf4c71d5b9967b07909d744c3944cf5bf6bf638e04e13877ba36921

data/VERSION

@@ -1 +1 @@
-0.1.74
+0.1.75

data/bin/txcatcher

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
 
-require 'goliath'
+clean = ARGV.include?("--clean")
+require 'goliath' unless clean
 require_relative '../lib/txcatcher'
-require_relative '../lib/txcatcher/server'
-require 'ffi-rzmq'
 
-TxCatcher::Catcher.new(name: TxCatcher::Config.zeromq)
-TxCatcher::Cleaner.start
+if clean
+  TxCatcher::Cleaner.start(run_once: true)
+else
+  require_relative '../lib/txcatcher/server'
+  require 'ffi-rzmq'
+  TxCatcher::Catcher.new(name: TxCatcher::Config.zeromq)
+  TxCatcher::Cleaner.start_in_thread
+end

data/lib/txcatcher/cleaner.rb

@@ -12,32 +12,36 @@ module TxCatcher
       end
     
       def start(run_once: false)
+        loop do
+          @@cleaning_counter = { transactions: 0, deposits: 0, addresses: 0 }
+          db_tx_count = if Config.protected_transactions
+            TxCatcher::Transaction.where(Sequel.~(protected: true)).count
+          else
+            TxCatcher::Transaction.count
+          end
+          $stdout.print "Cleaning transactions in DB..."
+          $stdout.print "#{db_tx_count} now, needs to be below #{Config.max_db_transactions_stored}\n"
+          if db_tx_count > Config.max_db_transactions_stored
+            number_to_delete = (db_tx_count - Config.max_db_transactions_stored) + (Config.max_db_transactions_stored*0.1).round
+            clean_transactions(number_to_delete)
+            $stdout.puts "DB cleaned: #{@@cleaning_counter.to_s}"
+          else
+            $stdout.puts "Nothing to be cleaned from DB, size is below threshold."
+          end
+          if @stop || run_once
+            @@stopped = true
+            break
+          end
+          sleep Config.db_clean_period_seconds
+        end
+      end
+
+      def start_in_thread(run_once: false)
         @@stopped = false
         @@stop    = false
         Thread.new do
-          loop do
-            @@cleaning_counter = { transactions: 0, deposits: 0, addresses: 0 }
-            db_tx_count = if Config.protected_transactions
-              TxCatcher::Transaction.where(Sequel.~(protected: true)).count
-            else
-              TxCatcher::Transaction.count
-            end
-            $stdout.print "Cleaning transactions in DB..."
-            $stdout.print "#{db_tx_count} now, needs to be below #{Config.max_db_transactions_stored}\n"
-            if db_tx_count > Config.max_db_transactions_stored
-              number_to_delete = (db_tx_count - Config.max_db_transactions_stored) + (Config.max_db_transactions_stored*0.1).round
-              clean_transactions(number_to_delete)
-              $stdout.puts "DB cleaned: #{@@cleaning_counter.to_s}"
-            else
-              $stdout.puts "Nothing to be cleaned from DB, size is below threshold."
-            end
-            if @stop || run_once
-              @@stopped = true
-              break
-            end
-            sleep Config.db_clean_period_seconds
-          end # loop
-        end # Thread
+          start(run_once: run_once)
+        end
         @@stopped
       end
 

data/txcatcher.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: txcatcher 0.1.74 ruby lib
+# stub: txcatcher 0.1.75 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "txcatcher"
-  s.version = "0.1.74"
+  s.version = "0.1.75"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: txcatcher
 version: !ruby/object:Gem::Version
-  version: 0.1.74
+  version: 0.1.75
 platform: ruby
 authors:
 - Roman Snitko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath