Commit 3015e768 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Revert "Reverse pipelines controller changes"

This reverts commit 0a60cdb110754a5e894ca1a2aa619842f2d98d1a.
parent 062806e4
module ActiveRecord
class QueryRecorder
attr_reader :log
attr_reader :start
attr_reader :end
def initialize(&block)
@log = []
@start = Time.now
ActiveSupport::Notifications.subscribed(method(:callback), 'sql.active_record', &block)
@end = Time.now
end
def callback(name, start, finish, message_id, values)
return if %w(SCHEMA).include?(values[:name])
@log << values[:sql]
end
def time
@end - @start
end
def count
@log.count
end
def log_message
@log.join("\n\n")
end
end
end
class Projects::PipelinesController < Projects::ApplicationController class Projects::PipelinesController < Projects::ApplicationController
before_action :pipeline, except: [:index, :new, :create, :charts] before_action :pipeline, except: [:index, :new, :create, :charts]
before_action :commit, only: [:show, :builds] before_action :commit, only: [:show, :builds]
...@@ -29,18 +61,15 @@ class Projects::PipelinesController < Projects::ApplicationController ...@@ -29,18 +61,15 @@ class Projects::PipelinesController < Projects::ApplicationController
respond_to do |format| respond_to do |format|
format.html format.html
format.json do format.json do
render json: { result = nil
pipelines: PipelineSerializer queries = ActiveRecord::QueryRecorder.new do
result = PipelineSerializer
.new(project: @project, user: @current_user) .new(project: @project, user: @current_user)
.with_pagination(request, response) .with_pagination(request, response)
.represent(@pipelines), .represent(@pipelines)
count: { end
all: @pipelines_count,
running: @running_count, render json: { aa_queries: queries.count, aa_time: queries.time, result: result }
pending: @pending_count,
finished: @finished_count,
}
}
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment