Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop colorizing log files by default #6949

Merged
merged 2 commits into from May 15, 2019
Merged

Stop colorizing log files by default #6949

merged 2 commits into from May 15, 2019

Conversation

zeripath
Copy link
Contributor

Fix #6942

@zeripath zeripath added this to the 1.9.0 milestone May 14, 2019
@zeripath zeripath changed the title Stop colorizing files by default Stop colorizing log files by default May 14, 2019
@codecov-io
Copy link

codecov-io commented May 14, 2019 •
edited

Codecov Report

❗ No coverage uploaded for pull request base (master@7dd9837). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #6949   +/-   ##
=========================================
  Coverage          ?   41.48%           
=========================================
  Files             ?      441           
  Lines             ?    59662           
  Branches          ?        0           
=========================================
  Hits              ?    24750           
  Misses            ?    31689           
  Partials          ?     3223
Impacted Files Coverage Δ
modules/setting/log.go 74.64% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7dd9837...7d6fd77. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 14, 2019
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 14, 2019
lunny
lunny requested changes May 15, 2019
View reviewed changes
modules/setting/log.go
@@ -113,7 +112,6 @@ func generateLogConfig(sec *ini.Section, name string, defaults defaultLogOptions
panic(err.Error())
}

logConfig["colorize"] = sec.Key("COLORIZE").MustBool(runtime.GOOS != "windows")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So file logs always have no colorize?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope it falls through to:

https://github.com/zeripath/gitea/blob/be7956b573a3bee81ab03ff6b215700729c83d51/modules/setting/log.go#L135

So it just defaults to false

@lafriks lafriks requested a review from lunny May 15, 2019 14:49
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 15, 2019
@zeripath zeripath merged commit 775a5a5 into go-gitea:master May 15, 2019
@zeripath zeripath deleted the stop-colorizing-file-logs branch May 20, 2019 15:36
jeffliu27 pushed a commit to jeffliu27/gitea that referenced this pull request Jul 18, 2019
@zeripath @jeffliu27
Stop colorizing files by default (go-gitea#6949)
6b92314
@zeripath zeripath mentioned this pull request Jul 31, 2019
Merged
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@mrsdizzie mrsdizzie mrsdizzie approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.9.0
Development

Successfully merging this pull request may close these issues.

New colorized logging causes fail2ban to stop matching
6 participants
@zeripath @codecov-io @lunny @mrsdizzie @GiteaBot @lafriks