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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
08a47a25
Commit
08a47a25
authored
Sep 08, 2020
by
Peter Leitzen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'app-logger-15' into 'master'
Use applogger in lib/gitlab/ See merge request gitlab-org/gitlab!41075
parents
1d01b553
117e58d1
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
5 deletions
+10
-5
changelogs/unreleased/app-logger-15.yml
changelogs/unreleased/app-logger-15.yml
+5
-0
lib/gitlab/metrics/samplers/puma_sampler.rb
lib/gitlab/metrics/samplers/puma_sampler.rb
+1
-1
lib/gitlab/middleware/read_only/controller.rb
lib/gitlab/middleware/read_only/controller.rb
+1
-1
lib/gitlab/sanitizers/exif.rb
lib/gitlab/sanitizers/exif.rb
+1
-1
lib/mattermost/session.rb
lib/mattermost/session.rb
+1
-1
lib/microsoft_teams/notifier.rb
lib/microsoft_teams/notifier.rb
+1
-1
No files found.
changelogs/unreleased/app-logger-15.yml
0 → 100644
View file @
08a47a25
---
title
:
Use applogger in lib/gitlab/
merge_request
:
41075
author
:
Rajendra Kadam
type
:
other
lib/gitlab/metrics/samplers/puma_sampler.rb
View file @
08a47a25
...
...
@@ -42,7 +42,7 @@ module Gitlab
def
puma_stats
Puma
.
stats
rescue
NoMethodError
Rails
.
logger
.
info
"PumaSampler: stats are not available yet, waiting for Puma to boot"
# rubocop:disable Gitlab/RailsLogger
Gitlab
::
AppLogger
.
info
"PumaSampler: stats are not available yet, waiting for Puma to boot"
nil
end
...
...
lib/gitlab/middleware/read_only/controller.rb
View file @
08a47a25
...
...
@@ -36,7 +36,7 @@ module Gitlab
def
call
if
disallowed_request?
&&
Gitlab
::
Database
.
read_only?
Rails
.
logger
.
debug
(
'GitLab ReadOnly: preventing possible non read-only operation'
)
# rubocop:disable Gitlab/RailsLogger
Gitlab
::
AppLogger
.
debug
(
'GitLab ReadOnly: preventing possible non read-only operation'
)
if
json_request?
return
[
403
,
{
'Content-Type'
=>
APPLICATION_JSON
},
[{
'message'
=>
ERROR_MESSAGE
}.
to_json
]]
...
...
lib/gitlab/sanitizers/exif.rb
View file @
08a47a25
...
...
@@ -48,7 +48,7 @@ module Gitlab
attr_reader
:logger
def
initialize
(
logger:
Rails
.
logger
)
# rubocop:disable Gitlab/RailsLogger
def
initialize
(
logger:
Gitlab
::
AppLogger
)
@logger
=
logger
end
...
...
lib/mattermost/session.rb
View file @
08a47a25
...
...
@@ -41,7 +41,7 @@ module Mattermost
begin
yield
self
rescue
Errno
::
ECONNREFUSED
=>
e
Rails
.
logger
.
error
(
e
.
message
+
"
\n
"
+
e
.
backtrace
.
join
(
"
\n
"
))
# rubocop:disable Gitlab/RailsLogger
Gitlab
::
AppLogger
.
error
(
e
.
message
+
"
\n
"
+
e
.
backtrace
.
join
(
"
\n
"
))
raise
Mattermost
::
NoSessionError
ensure
destroy
...
...
lib/microsoft_teams/notifier.rb
View file @
08a47a25
...
...
@@ -19,7 +19,7 @@ module MicrosoftTeams
result
=
true
if
response
rescue
Gitlab
::
HTTP
::
Error
,
StandardError
=>
error
Rails
.
logger
.
info
(
"
#{
self
.
class
.
name
}
: Error while connecting to
#{
@webhook
}
:
#{
error
.
message
}
"
)
# rubocop:disable Gitlab/RailsLogger
Gitlab
::
AppLogger
.
info
(
"
#{
self
.
class
.
name
}
: Error while connecting to
#{
@webhook
}
:
#{
error
.
message
}
"
)
end
result
...
...
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