[zomekiv3-sqr:01012] Fix lock for sequence

app/models/sys/sequence.rb

@@ -5,10 +5,22 @@ class Sys::Sequence < ApplicationRecord
   validates :version, uniqueness: { scope: [:site_id, :name] }
 
   def self.next(name, version, site_id)
-    self.transaction do
-      seq = self.lock.find_or_create_by(name: name, version: version, site_id: site_id)
-      seq.increment!(:value)
-      return seq
+    try = 0
+
+    begin
+      try += 1
+      self.transaction do
+        seq = self.find_or_create_by!(name: name, version: version, site_id: site_id)
+        seq.lock!
+        seq.increment!(:value)
+        return seq
+      end
+    rescue ActiveRecord::RecordInvalid => e
+      if try < 5
+        retry
+      else
+        raise e
+      end
     end
   end
 end

lib/util/sequencer.rb

@@ -6,12 +6,12 @@ def self.next_id(name, options = {})
     version = options[:version].to_i
     site_id = options[:site_id]
 
-    lock = Util::File::Lock.lock("#{name}_#{version}_#{site_id}")
-    raise 'error: sequencer locked' unless lock
+    #lock = Util::File::Lock.lock("#{name}_#{version}_#{site_id}")
+    #raise 'error: sequencer locked' unless lock
 
     seq = Sys::Sequence.next(name, version, site_id)
 
-    lock.unlock
+    #lock.unlock
 
     if options[:md5]
       Digest::MD5.new.update(seq.value.to_s)