moose-inventory 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 570b23a90a452e12fb6aa8f03e5b9613a3c365ff
-  data.tar.gz: 152441118aedc1f0935510e6f9c7357d514553b7
+  metadata.gz: 97767bc15af5cacaf663c0d481bdf3bb3ce44945
+  data.tar.gz: b78aee8bd6198832650adf9f6d396f0f8e104ec2
 SHA512:
-  metadata.gz: 15a262e2ac4d8bab1fc356b7f60aceb612544d09a1df770952199eabe4668923dae44d40cf2d76460939f197374208bef687c8e33a70f575979a9635bbceaa38
-  data.tar.gz: 44eb25e1744164bc618c5d54ae52bc926f30f8e5c265939fb7ae53dd857ec8c676831089713b1d674f7c17079d723bbf310189d890a88bf76e163ca4649ff094
+  metadata.gz: f72e5c69616c5453b9a03282754ba78292e4c92e3f6e9293b9ab3bb62f99a6cc616bad2ed3701e568565e881eef47321d7dac15bfded5085210b677152f78366
+  data.tar.gz: f8c1100975131c6646659b642efad9e579eef5984cf5c6bd4b886d609e08b6f78c0d21dba0340e81f8b0f41229bfcb3bb3554cdf077da194baa4943f22838c51

data/lib/moose_inventory/db/db.rb

@@ -65,17 +65,46 @@ module Moose
       #--------------------
       def self.transaction
         fail('Database connection has not been established') if @db.nil?
+        
+        tries = 0
+        
         begin
           @db.transaction(savepoint: true) do
             yield
           end
 
+          rescue Sequel::DatabaseError => e
+          # We want to rescue Sqlite3::BusyException.  But, sequel catches that
+          # and re-raises it as Sequel::DatabaseError, with a message referencing
+          # the original exception class  
+           
+          # We look into e, to see whether it is a BusyException.  If not, 
+          # we re-raise immediately.  
+          raise unless e.message.include?("BusyException")  
+
+          # Looks like a BusyException, so we retrying, with a random stand-off.           
+          tries += 1
+          case tries
+          when 1..10
+            if Moose::Inventory::Config._confopts[:trace] == true
+              STDERR.puts e.message
+            end
+            warn('The database appears to be locked by another process. '\
+                 " This was try #{tries} of 10. "\
+                 ' Retrying after a pause of random duration.')
+            sleep rand()
+            retry
+          else
+            raise 
+          end
+            
         rescue @exceptions[:moose] => e
           warn 'An error occurred during a transaction, any changes have been rolled back.'
 
           if Moose::Inventory::Config._confopts[:trace] == true
+            STDERR.puts $!.backtrace    
             abort("ERROR: #{e}")
-          else          
+          else      
             abort("ERROR: #{e.message}")
           end
 

data/lib/moose_inventory/version.rb

@@ -2,6 +2,6 @@ module Moose
   ##
   # The Moose-Tools dynamic inventory management library
   module Inventory
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moose-inventory
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Russell Davies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: indentation