Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
0720b9ce
Commit
0720b9ce
authored
Aug 01, 2016
by
Ahmad Sherif
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Catch what warden might throw when profiling requests to re-throw it
Closes #20488
parent
0819461e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
CHANGELOG
CHANGELOG
+1
-0
lib/gitlab/request_profiler/middleware.rb
lib/gitlab/request_profiler/middleware.rb
+8
-2
No files found.
CHANGELOG
View file @
0720b9ce
...
@@ -44,6 +44,7 @@ v 8.11.0 (unreleased)
...
@@ -44,6 +44,7 @@ v 8.11.0 (unreleased)
- Reduce number of queries made for merge_requests/:id/diffs
- Reduce number of queries made for merge_requests/:id/diffs
- Sensible state specific default sort order for issues and merge requests !5453 (tomb0y)
- Sensible state specific default sort order for issues and merge requests !5453 (tomb0y)
- Fix RequestProfiler::Middleware error when code is reloaded in development
- Fix RequestProfiler::Middleware error when code is reloaded in development
- Catch what warden might throw when profiling requests to re-throw it
v 8.10.3 (unreleased)
v 8.10.3 (unreleased)
- Fix importer for GitHub Pull Requests when a branch was removed
- Fix importer for GitHub Pull Requests when a branch was removed
...
...
lib/gitlab/request_profiler/middleware.rb
View file @
0720b9ce
...
@@ -29,7 +29,9 @@ module Gitlab
...
@@ -29,7 +29,9 @@ module Gitlab
def
call_with_profiling
(
env
)
def
call_with_profiling
(
env
)
ret
=
nil
ret
=
nil
result
=
RubyProf
::
Profile
.
profile
do
result
=
RubyProf
::
Profile
.
profile
do
ret
=
@app
.
call
(
env
)
ret
=
catch
(
:warden
)
do
@app
.
call
(
env
)
end
end
end
printer
=
RubyProf
::
CallStackPrinter
.
new
(
result
)
printer
=
RubyProf
::
CallStackPrinter
.
new
(
result
)
...
@@ -41,7 +43,11 @@ module Gitlab
...
@@ -41,7 +43,11 @@ module Gitlab
printer
.
print
(
file
)
printer
.
print
(
file
)
end
end
ret
if
ret
.
is_a?
(
Array
)
ret
else
throw
(
:warden
,
ret
)
end
end
end
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment