aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXinhui2016-10-06 14:50:06 +0200
committerXinhui2016-10-06 14:50:12 +0200
commit670cba148163f8ea9a03bf89097fb3333feb1d13 (patch)
treeec04f763d2ffcfb9bf9e5af664eab8b94d4b5f32
parent4b713d8b7b1097838a78d36dae3ec1cfac711349 (diff)
downloadchouette-core-670cba148163f8ea9a03bf89097fb3333feb1d13.tar.bz2
Override codifligne api url
Refs #1765
-rw-r--r--app/workers/stop_area_referential_sync_worker.rb2
-rw-r--r--config/environments/development.rb1
-rw-r--r--config/initializers/codifligne.rb3
3 files changed, 5 insertions, 1 deletions
diff --git a/app/workers/stop_area_referential_sync_worker.rb b/app/workers/stop_area_referential_sync_worker.rb
index 662652831..dede018dd 100644
--- a/app/workers/stop_area_referential_sync_worker.rb
+++ b/app/workers/stop_area_referential_sync_worker.rb
@@ -9,7 +9,7 @@ class StopAreaReferentialSyncWorker
def perform(stop_area_ref_sync_id)
start_time = process_time
stop_ref_sync = StopAreaReferentialSync.find stop_area_ref_sync_id
- stop_ref_sync.run
+ stop_ref_sync.run if stop_ref_sync.may_run?
begin
info = Stif::ReflexSynchronization.synchronize
stop_ref_sync.successful info.merge({processing_time: process_time - start_time})
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 47e365098..63f9c94a8 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -58,6 +58,7 @@ Rails.application.configure do
# Reflex api url
config.reflex_api_url = "https://195.46.215.128/ws/reflex/V1/service=getData"
+ # config.codifligne_api_url = ""https://codifligne.stif.info/rest/v1/lc/getlist""
# config.chouette_authentication_settings = {
# type: "database"
diff --git a/config/initializers/codifligne.rb b/config/initializers/codifligne.rb
new file mode 100644
index 000000000..321419e02
--- /dev/null
+++ b/config/initializers/codifligne.rb
@@ -0,0 +1,3 @@
+if Rails.application.config.try(:codifligne_api_url)
+ Codifligne::API.base_url = Rails.application.config.codifligne_api_url
+end