istox 0.1.43.6 → 0.1.43.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e258459d79693a10ebea867061752ccf609c415df83bb2011c4218f68eda156
-  data.tar.gz: 8314a4eff96fc09876dd23a2bb6942ff788aaefd24d5d1b1aa756b8df8d4b34f
+  metadata.gz: 7714a5d3bc4fdca3f2127988029cf9433e74e2cdb72c69603a0e9e98f61da712
+  data.tar.gz: 3862b77faeb51a1a2b565ec2d7bb8daea6833c18ae0bed91df1e9b2b0af02a95
 SHA512:
-  metadata.gz: 6b2d2e8fe5269963e3b2d6eaf9938c101c2186222466063645035a2d91b19c48608386ecb532b152ab96e31906ee5c74cf56fc9267dc2fd6d354092e6ed39774
-  data.tar.gz: da57d2d75f3f54a94698f8a4da65c9a5327f864ee36a7c3fb60c7c7e27d2ec67537f1726318a6c7d9e53b69250e3cdf8e833ff5cdc68b5c9e809df2efc80c9cd
+  metadata.gz: 64f3cc5b014f6689b7440796ec828136c93e319596d0d47a273aa227ab964d327a95de8ba953f6ca83cd0d6f5f73ec1702225676aefa3428917a1aca91afa5bb
+  data.tar.gz: b924e4cd0728b6ce65c1aa7a234a77c06ce8542386c91157b6934794109684cde458688d657c2ffd3c2eb6f2c5784db0d9f52965753bfaf5d359361854be8f58

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.43.4)
+    istox (0.1.43.7)
       bunny (>= 2.12.0)
       graphlient
       gruf

data/lib/istox.rb

@@ -19,7 +19,9 @@ module Istox
   require "istox/helpers/blockchain_receipt_service"
   require "istox/models/blockchain_receipt"
   require "istox/models/concerns/blockchain_receipt_query"
+  require "istox/models/lock"
   require "istox/consumers/blockchain_status_handler"
   require "istox/consumers/blockchain_hash_handler"
   require "istox/migrations/create_blockchain_receipts"
+  require "istox/migrations/create_locks"
 end

data/lib/istox/consumers/blockchain_hash_handler.rb

@@ -2,14 +2,18 @@ module Istox
   class BlockchainHashHandler
     class << self
       def hash_generated(data)
-        receipt = ::Istox::BlockchainReceipt.where(txid: data.uuid, txhash: nil).first
+        puts "Locking #{data.uuid}"
+        ::Istox::Lock.acquire(data.uuid) do
+          receipt = ::Istox::BlockchainReceipt.where(txid: data.uuid, txhash: nil).first
 
-        if receipt.nil?
-          puts 'Transaction not found, skipping...'
-          return
+          if receipt.nil?
+            puts 'Transaction not found, skipping...'
+            return
+          end
+          
+          receipt.update!(txhash: data.txnHash)
         end
-        
-        receipt.update!(txhash: data.txnHash)
+        puts "Releasing lock for #{data.uuid}"
       end
 
     end

data/lib/istox/migrations/create_locks.rb

@@ -0,0 +1,18 @@
+module Istox
+  class CreateLocks < ActiveRecord::Migration[5.0]
+
+    def self.up
+      create_table :locks do |t|
+        t.string :name, :limit => 40
+        t.timestamps
+      end
+      add_index :locks, :name, :unique => true
+    end
+
+    def self.down
+      remove_index :locks, :column => :name
+      drop_table :locks
+    end
+
+  end
+end

data/lib/istox/models/lock.rb

@@ -0,0 +1,51 @@
+module Istox
+  class Lock < ActiveRecord::Base
+
+    def self.acquire(name)
+      already_acquired = definitely_acquired?(name)
+
+      if already_acquired
+        yield
+      else
+        begin
+          create(:name => name) unless find_by_name(name)
+        rescue ActiveRecord::StatementInvalid
+          # concurrent create is okay
+        end
+
+        begin
+          result = nil
+
+          transaction do
+            find_by_name(name, :lock => true) # this is the call that will block
+            acquired_lock(name)
+            result = yield
+          end
+
+          result
+        ensure
+          maybe_released_lock(name) 
+        end
+      end
+    end
+
+    # if true, the lock is acquired
+    # if false, the lock might still be acquired, because we were in another db transaction
+    def self.definitely_acquired?(name)
+      !!Thread.current[:definitely_acquired_locks] and Thread.current[:definitely_acquired_locks].has_key?(name)
+    end
+
+    def self.acquired_lock(name)
+      Thread.current[:definitely_acquired_locks] ||= {}
+      Thread.current[:definitely_acquired_locks][name] = true
+    end
+
+    def self.maybe_released_lock(name)
+      Thread.current[:definitely_acquired_locks] ||= {}
+      Thread.current[:definitely_acquired_locks].delete(name)
+    end
+
+    private_class_method :acquired_lock, :maybe_released_lock
+
+  end
+end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = "0.1.43.6"
+  VERSION = "0.1.43.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.43.6
+  version: 0.1.43.7
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -234,8 +234,10 @@ files:
 - lib/istox/helpers/publisher.rb
 - lib/istox/interfaces/chainhub/transaction.rb
 - lib/istox/migrations/create_blockchain_receipts.rb
+- lib/istox/migrations/create_locks.rb
 - lib/istox/models/blockchain_receipt.rb
 - lib/istox/models/concerns/blockchain_receipt_query.rb
+- lib/istox/models/lock.rb
 - lib/istox/version.rb
 homepage: http://www.abc.com
 licenses: []