[ARVADOS] updated: b0c5270a1a88ab2a19bfff5ced4e5e17f5264e9e

git at public.curoverse.com git at public.curoverse.com
Mon Mar 16 19:18:16 EDT 2015


Summary of changes:
 services/api/app/controllers/application_controller.rb       | 5 ++---
 services/api/app/controllers/arvados/v1/jobs_controller.rb   | 2 ++
 services/api/app/controllers/arvados/v1/nodes_controller.rb  | 2 ++
 services/api/app/controllers/arvados/v1/schema_controller.rb | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

       via  b0c5270a1a88ab2a19bfff5ced4e5e17f5264e9e (commit)
      from  b5c40a0304a9de42ae0ed3d0517e1365552c0e04 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b0c5270a1a88ab2a19bfff5ced4e5e17f5264e9e
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon Mar 16 19:16:46 2015 -0400

    5383: revert db_current_time back to Time.now in application_controller as the usages were for error tokens and request profiling only.

diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index 638d236..69c03bd 100644
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -21,7 +21,6 @@ class ApplicationController < ActionController::Base
   include ThemesForRails::ActionController
   include LoadParam
   include RecordFilters
-  include DbCurrentTime
 
   respond_to :json
   protect_from_forgery
@@ -177,7 +176,7 @@ class ApplicationController < ActionController::Base
       err = {}
     end
     err[:errors] ||= args
-    err[:error_token] = [db_current_time.utc.to_i, "%08x" % rand(16 ** 8)].join("+")
+    err[:error_token] = [Time.now.utc.to_i, "%08x" % rand(16 ** 8)].join("+")
     status = err.delete(:status) || 422
     logger.error "Error #{err[:error_token]}: #{status}"
     send_json err, status: status
@@ -528,7 +527,7 @@ class ApplicationController < ActionController::Base
           params[:_profile] &&
           Thread.current[:request_starttime]
         response[:_profile] = {
-          request_time: db_current_time - Thread.current[:request_starttime]
+          request_time: Time.now - Thread.current[:request_starttime]
         }
       end
     end
diff --git a/services/api/app/controllers/arvados/v1/jobs_controller.rb b/services/api/app/controllers/arvados/v1/jobs_controller.rb
index 3a255ad..ce8a05c 100644
--- a/services/api/app/controllers/arvados/v1/jobs_controller.rb
+++ b/services/api/app/controllers/arvados/v1/jobs_controller.rb
@@ -5,6 +5,8 @@ class Arvados::V1::JobsController < ApplicationController
   skip_before_filter :find_object_by_uuid, :only => [:queue, :queue_size]
   skip_before_filter :render_404_if_no_object, :only => [:queue, :queue_size]
 
+  include DbCurrentTime
+
   def create
     [:repository, :script, :script_version, :script_parameters].each do |r|
       if !resource_attrs[r]
diff --git a/services/api/app/controllers/arvados/v1/nodes_controller.rb b/services/api/app/controllers/arvados/v1/nodes_controller.rb
index fc3384b..4ab5695 100644
--- a/services/api/app/controllers/arvados/v1/nodes_controller.rb
+++ b/services/api/app/controllers/arvados/v1/nodes_controller.rb
@@ -3,6 +3,8 @@ class Arvados::V1::NodesController < ApplicationController
   skip_before_filter :find_object_by_uuid, :only => :ping
   skip_before_filter :render_404_if_no_object, :only => :ping
 
+  include DbCurrentTime
+
   def update
     if resource_attrs[:job_uuid]
       @object.job_readable = readable_job_uuids(resource_attrs[:job_uuid]).any?
diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb
index 5a84ef5..dcc9c63 100644
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@ -9,6 +9,8 @@ class Arvados::V1::SchemaController < ApplicationController
   skip_before_filter :render_404_if_no_object
   skip_before_filter :require_auth_scope
 
+  include DbCurrentTime
+
   def index
     expires_in 24.hours, public: true
     discovery = Rails.cache.fetch 'arvados_v1_rest_discovery' do

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list