projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '20183-update-priority-thread' refs #20183
[arvados.git]
/
services
/
api
/
config
/
routes.rb
diff --git
a/services/api/config/routes.rb
b/services/api/config/routes.rb
index 69758580356ba771ac05a70e022735fe092962d5..87e2737575675e2d37fc9c2b778771be89001193 100644
(file)
--- a/
services/api/config/routes.rb
+++ b/
services/api/config/routes.rb
@@
-40,6
+40,7
@@
Rails.application.routes.draw do
get 'auth', on: :member
post 'lock', on: :member
post 'unlock', on: :member
get 'auth', on: :member
post 'lock', on: :member
post 'unlock', on: :member
+ post 'update_priority', on: :member
get 'secret_mounts', on: :member
get 'current', on: :collection
end
get 'secret_mounts', on: :member
get 'current', on: :collection
end
@@
-81,7
+82,6
@@
Rails.application.routes.draw do
post 'activate', on: :member
post 'setup', on: :collection
post 'unsetup', on: :member
post 'activate', on: :member
post 'setup', on: :collection
post 'unsetup', on: :member
- post 'update_uuid', on: :member
post 'merge', on: :collection
patch 'batch_update', on: :collection
end
post 'merge', on: :collection
patch 'batch_update', on: :collection
end
@@
-93,6
+93,8
@@
Rails.application.routes.draw do
end
end
end
end
+ post '/sys/trash_sweep', to: 'sys#trash_sweep'
+
if Rails.env == 'test'
post '/database/reset', to: 'database#reset'
end
if Rails.env == 'test'
post '/database/reset', to: 'database#reset'
end
@@
-111,7
+113,8
@@
Rails.application.routes.draw do
match '/static/login_failure', to: 'static#login_failure', as: :login_failure, via: [:get, :post]
match '/static/login_failure', to: 'static#login_failure', as: :login_failure, via: [:get, :post]
- match '/_health/ping', to: 'arvados/v1/healthcheck#ping', via: [:get]
+ match '/_health/:check', to: 'arvados/v1/management#health', via: [:get]
+ match '/metrics', to: 'arvados/v1/management#metrics', via: [:get]
# Send unroutable requests to an arbitrary controller
# (ends up at ApplicationController#render_not_found)
# Send unroutable requests to an arbitrary controller
# (ends up at ApplicationController#render_not_found)