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
c562a8e6
Commit
c562a8e6
authored
Sep 10, 2020
by
Luke Duncalfe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'app-logger-16' into 'master'"
This reverts merge request !41116
parent
ef14a099
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
9 deletions
+8
-9
changelogs/unreleased/app-logger-16.yml
changelogs/unreleased/app-logger-16.yml
+0
-5
lib/rspec_flaky/listener.rb
lib/rspec_flaky/listener.rb
+4
-2
lib/tasks/gitlab/cleanup.rake
lib/tasks/gitlab/cleanup.rake
+4
-2
No files found.
changelogs/unreleased/app-logger-16.yml
deleted
100644 → 0
View file @
ef14a099
---
title
:
Use AppLogger in listener.rb, cleaner.rake, helpers.rb and spec files
merge_request
:
41116
author
:
Rajendra Kadam
type
:
other
lib/rspec_flaky/listener.rb
View file @
c562a8e6
...
@@ -32,19 +32,21 @@ module RspecFlaky
...
@@ -32,19 +32,21 @@ module RspecFlaky
flaky_examples
[
current_example
.
uid
]
=
flaky_example
flaky_examples
[
current_example
.
uid
]
=
flaky_example
end
end
# rubocop:disable Gitlab/RailsLogger
def
dump_summary
(
_
)
def
dump_summary
(
_
)
RspecFlaky
::
Report
.
new
(
flaky_examples
).
write
(
RspecFlaky
::
Config
.
flaky_examples_report_path
)
RspecFlaky
::
Report
.
new
(
flaky_examples
).
write
(
RspecFlaky
::
Config
.
flaky_examples_report_path
)
# write_report_file(flaky_examples, RspecFlaky::Config.flaky_examples_report_path)
# write_report_file(flaky_examples, RspecFlaky::Config.flaky_examples_report_path)
new_flaky_examples
=
flaky_examples
-
suite_flaky_examples
new_flaky_examples
=
flaky_examples
-
suite_flaky_examples
if
new_flaky_examples
.
any?
if
new_flaky_examples
.
any?
Gitlab
::
AppL
ogger
.
warn
"
\n
New flaky examples detected:
\n
"
Rails
.
l
ogger
.
warn
"
\n
New flaky examples detected:
\n
"
Gitlab
::
AppL
ogger
.
warn
Gitlab
::
Json
.
pretty_generate
(
new_flaky_examples
.
to_h
)
Rails
.
l
ogger
.
warn
Gitlab
::
Json
.
pretty_generate
(
new_flaky_examples
.
to_h
)
RspecFlaky
::
Report
.
new
(
new_flaky_examples
).
write
(
RspecFlaky
::
Config
.
new_flaky_examples_report_path
)
RspecFlaky
::
Report
.
new
(
new_flaky_examples
).
write
(
RspecFlaky
::
Config
.
new_flaky_examples_report_path
)
# write_report_file(new_flaky_examples, RspecFlaky::Config.new_flaky_examples_report_path)
# write_report_file(new_flaky_examples, RspecFlaky::Config.new_flaky_examples_report_path)
end
end
end
end
# rubocop:enable Gitlab/RailsLogger
private
private
...
...
lib/tasks/gitlab/cleanup.rake
View file @
c562a8e6
...
@@ -178,17 +178,19 @@ namespace :gitlab do
...
@@ -178,17 +178,19 @@ namespace :gitlab do
end
end
end
end
# rubocop:disable Gitlab/RailsLogger
def
logger
def
logger
return
@logger
if
defined?
(
@logger
)
return
@logger
if
defined?
(
@logger
)
@logger
=
if
Rails
.
env
.
development?
||
Rails
.
env
.
production?
@logger
=
if
Rails
.
env
.
development?
||
Rails
.
env
.
production?
Logger
.
new
(
STDOUT
).
tap
do
|
stdout_logger
|
Logger
.
new
(
STDOUT
).
tap
do
|
stdout_logger
|
stdout_logger
.
extend
(
ActiveSupport
::
Logger
.
broadcast
(
Gitlab
::
AppL
ogger
))
stdout_logger
.
extend
(
ActiveSupport
::
Logger
.
broadcast
(
Rails
.
l
ogger
))
stdout_logger
.
level
=
debug?
?
Logger
::
DEBUG
:
Logger
::
INFO
stdout_logger
.
level
=
debug?
?
Logger
::
DEBUG
:
Logger
::
INFO
end
end
else
else
Gitlab
::
AppL
ogger
Rails
.
l
ogger
end
end
end
end
# rubocop:enable Gitlab/RailsLogger
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