diff options
| author | Xinhui | 2017-01-12 15:41:31 +0100 |
|---|---|---|
| committer | Xinhui | 2017-01-12 15:41:38 +0100 |
| commit | b0f53db2facca6ae040d70ff1d041847e566dc2f (patch) | |
| tree | 99040b9c374224c0d7254c5156246ab927a4dfbf /app/models | |
| parent | 7494a76f42388c1f9c34c09b65a829c6ca05d829 (diff) | |
| download | chouette-core-b0f53db2facca6ae040d70ff1d041847e566dc2f.tar.bz2 | |
Set status failed for reflex:codiflign sync on sidekiq restart
Refs #2390
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/line_referential_sync.rb | 6 | ||||
| -rw-r--r-- | app/models/stop_area_referential_sync.rb | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/models/line_referential_sync.rb b/app/models/line_referential_sync.rb index a54d61edb..6730ddd73 100644 --- a/app/models/line_referential_sync.rb +++ b/app/models/line_referential_sync.rb @@ -6,6 +6,8 @@ class LineReferentialSync < ActiveRecord::Base after_commit :perform_sync, :on => :create validate :multiple_process_validation, :on => :create + scope :pending, -> { where(status: [:new, :pending]) } + private def perform_sync create_sync_message :info, :new @@ -26,7 +28,7 @@ class LineReferentialSync < ActiveRecord::Base state :failed event :run, after: :log_pending do - transitions :from => [:new, :failed], :to => :pending + transitions :from => :new, :to => :pending end event :successful, after: :log_successful do @@ -34,7 +36,7 @@ class LineReferentialSync < ActiveRecord::Base end event :failed, after: :log_failed do - transitions :from => :pending, :to => :failed + transitions :from => [:new, :pending], :to => :failed end end diff --git a/app/models/stop_area_referential_sync.rb b/app/models/stop_area_referential_sync.rb index 4de5f396a..a4e3eae30 100644 --- a/app/models/stop_area_referential_sync.rb +++ b/app/models/stop_area_referential_sync.rb @@ -6,6 +6,8 @@ class StopAreaReferentialSync < ActiveRecord::Base after_commit :perform_sync, :on => :create validate :multiple_process_validation, :on => :create + scope :pending, -> { where(status: [:new, :pending]) } + private def perform_sync create_sync_message :info, :new @@ -26,7 +28,7 @@ class StopAreaReferentialSync < ActiveRecord::Base state :failed event :run, after: :log_pending do - transitions :from => [:new, :failed], :to => :pending + transitions :from => :new, :to => :pending end event :successful, after: :log_successful do |