istox 0.1.43.7 → 0.1.43.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7714a5d3bc4fdca3f2127988029cf9433e74e2cdb72c69603a0e9e98f61da712
-  data.tar.gz: 3862b77faeb51a1a2b565ec2d7bb8daea6833c18ae0bed91df1e9b2b0af02a95
+  metadata.gz: 2b6adf4f4cd81ea05078209085ff282a104ca256a195c7d62edf4b93426e2206
+  data.tar.gz: a6a61794794811c14fcdb7e83d3a9d8bbf9c59d3d1b5ee9537a71d07e57b89b1
 SHA512:
-  metadata.gz: 64f3cc5b014f6689b7440796ec828136c93e319596d0d47a273aa227ab964d327a95de8ba953f6ca83cd0d6f5f73ec1702225676aefa3428917a1aca91afa5bb
-  data.tar.gz: b924e4cd0728b6ce65c1aa7a234a77c06ce8542386c91157b6934794109684cde458688d657c2ffd3c2eb6f2c5784db0d9f52965753bfaf5d359361854be8f58
+  metadata.gz: 8bf29b2086bde99c0cac28eca61e86d224852a574814188a673a83a2d99b5389abd54489996ad3bf479f7dbbc018f3b339c8f17047c0bf1b5157143918685a65
+  data.tar.gz: c67f7c9831036e0ed7546f283655d7c7416e8f3a096425c86cb70a44bd72d0788969f836071cb606d681360fdc01e741cdbfe32b02dd71e4db35736bd6f33f60

data/lib/istox.rb

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

data/lib/istox/migrations/create_blockchain_receipts.rb

@@ -18,6 +18,7 @@ module Istox
                 t.datetime :deleted_at, index: true
                 t.timestamps
                 t.string :sid
+                t.integer :lock_version
             end
         end
     end

data/lib/istox/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.43.7
+  version: 0.1.43.8
 platform: ruby
 authors:
 - Siong Leng
@@ -234,10 +234,8 @@ 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: []

data/lib/istox/migrations/create_locks.rb

@@ -1,18 +0,0 @@
-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

@@ -1,51 +0,0 @@
-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