ruote-ar 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45956b7a81783e00454f1e1fe081c4de7d498b28
-  data.tar.gz: 297fa1eead0ae45858a6716f1a0165bbc3a49fd4
+  metadata.gz: beb4c18668af91fa8b6a4ba3a3abed4316e4fe77
+  data.tar.gz: 7a93b743ddb918d27aa1244450df79b8457b6fc7
 SHA512:
-  metadata.gz: 6dfeb77f03e9336c843b4ebcc47dcf7fdf5725bc35855f333397723871c61037c8a0755d12b4bacc352c07bc4421bb490f0714404334fb076aad47bec84c827d
-  data.tar.gz: 15b4c571acf51b7a4f4adaab89e34831ee0b922c30d23f6a4f8f9f3fc7335f88f8819310b070647d97d654e41f0d24553c2d5ab4826a16ab7e6496e03bae9df1
+  metadata.gz: ac677179ca943b539c4968729252b128b93a03c99b2527b076dcc068d73f0d78a05e6a773b981b8b18680a0ce0f5f482709fb01e9c60051c984970be1742fa19
+  data.tar.gz: bda0a68ab0aea9c55e794c3f58a97c6197219ea8137c8c22e5878b738ee12172a5d820d7c4ef55e6cd16287e9ec6e060ea0006bcc85b5c2c1865c362a084e9c2

data/lib/ruote/ar/storage.rb

@@ -14,6 +14,8 @@ module Ruote
 
         @table_name = options['table_name'] || ('documents').to_sym
         @ip = Ruote.local_ip
+        @last_time = Time.at(0.0).utc
+
         @worker = [current_worker_name, @ip.gsub(/\./, '_'), $$.to_s].join('/')
 
         replace_engine_configuration(options)
@@ -28,19 +30,50 @@ module Ruote
         nil
       end
 
+      def begin_step
+        
+        # release uncommited releases
+        connection.execute("ROLLBACK")
+
+        now = Time.now.utc
+        delta = now - @last_time
+
+        # just try release locked documents each 20 seconds
+        return if delta < 30
+
+        @last_time = now
+
+        # release all locked msgs
+        um = Arel::UpdateManager.new Arel::Table.engine
+        um.table table
+        um.where table[:typ].eq('msgs').and(table[:worker].eq(@worker))
+        um.set [
+          [table[:worker], nil]
+        ]
+      end
+
       # Used to reserve 'msgs' and 'schedules'. Simply update and
       # return true if the update was affected more than one line.
       #
       def reserve(doc)
         um = Arel::UpdateManager.new Arel::Table.engine
         um.table table
-        um.where table[:typ].eq(doc['type'].to_s).and(table[:ide].eq(doc['_id'].to_s).and(table[:rev].eq(1).and(table[:worker].eq(nil))))
+        um.where table[:typ].eq(doc['type'].to_s).
+          and(table[:ide].eq(doc['_id'].to_s).
+              and(table[:rev].eq(1).
+                  and(table[:worker].eq(nil))))
         um.set [
           [table[:worker], @worker]
         ]
-        connection.update(um.to_sql) > 0
+        if connection.update(um.to_sql) > 0
+          begin_transaction
+          true
+        else
+          false
+        end
       end
 
+
       # removing doc after success (or fail) success.
       # It's important to not leave any message.
       def done(doc)
@@ -48,6 +81,8 @@ module Ruote
         dm.from table
         dm.where table[:typ].eq(doc['type']).and(table[:ide].eq(doc['_id']).and(table[:rev].eq(1).and(table[:worker].eq(@worker))))
         connection.delete(dm)
+
+        commit
       end
 
       def put_schedule(flavour, owner_fei, s, msg)
@@ -330,7 +365,15 @@ module Ruote
         worker = Thread.current['ruote_worker']
         if worker
           worker.name
-        end || 'worker'
+        end || "worker"
+      end
+      
+      def begin_transaction
+        connection.execute("BEGIN")
+      end
+
+      def commit
+        connection.execute("COMMIT")
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruote-ar
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - pedroteixeira