Merge branch 'master' into 5383-api-db-current-time

[arvados.git] / services / api / app / middlewares / arvados_api_token.rb

diff --git a/services/api/app/middlewares/arvados_api_token.rb b/services/api/app/middlewares/arvados_api_token.rb
index 57d3ad02d748d7ee41540c0320ef8f068a8d375a..2bee50cc7f83316a7b7d07da856f52610524bfb7 100644 (file)
--- a/services/api/app/middlewares/arvados_api_token.rb
+++ b/services/api/app/middlewares/arvados_api_token.rb
@@ -2,7 +2,10 @@
 # this in the Rack stack instead of in ApplicationController because
 # websockets needs access to authentication but doesn't use any of the rails
 # active dispatch infrastructure.
+require 'db_current_time'
+
 class ArvadosApiToken
+  include DbCurrentTime
 
   # Create a new ArvadosApiToken handler
   # +app+  The next layer of the Rack stack.
@@ -24,7 +27,7 @@ class ArvadosApiToken
     params = request.params
     remote_ip = env["action_dispatch.remote_ip"]
 
-    Thread.current[:request_starttime] = Time.now
+    Thread.current[:request_starttime] = db_current_time
     user = nil
     api_client = nil
     api_client_auth = nil
@@ -51,7 +54,7 @@ class ArvadosApiToken
     Thread.current[:api_client] = api_client
     Thread.current[:user] = user
     if api_client_auth
-      api_client_auth.last_used_at = Time.now
+      api_client_auth.last_used_at = db_current_time
       api_client_auth.last_used_by_ip_address = remote_ip.to_s
       api_client_auth.save validate: false
     end