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.

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

Allow Macaron to be set to log through to gitea.log #5667

Merged

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Jan 8, 2019

This PR implements a mechanism to allow Macaron to be set to log through to the gitea.log rather than simply to the console.

Fix #4291

Signed-off-by: Andrew Thornton art27@cantab.net

@codecov-io
Copy link

codecov-io commented Jan 8, 2019

Codecov Report

Merging #5667 into master will decrease coverage by 0.02%.
The diff coverage is 13.72%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5667      +/-   ##
==========================================
- Coverage   38.74%   38.71%   -0.03%     
==========================================
  Files         330      330              
  Lines       48650    48697      +47     
==========================================
+ Hits        18850    18855       +5     
- Misses      27071    27112      +41     
- Partials     2729     2730       +1
Impacted Files Coverage Δ
modules/log/log.go 46.22% <0%> (-6.75%) ⬇️
modules/setting/setting.go 51.77% <100%> (+0.05%) ⬆️
routers/routes/routes.go 83.09% <26.08%> (-2.04%) ⬇️
models/repo_list.go 64.55% <0%> (+1.26%) ⬆️

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 3b7f41f...0bea77e. Read the comment docs.

@bkcsoft bkcsoft added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 8, 2019
custom/conf/app.ini.sample Outdated Show resolved Hide resolved
docs/content/doc/advanced/config-cheat-sheet.en-us.md Outdated Show resolved Hide resolved
@lafriks lafriks added the type/enhancement An improvement of existing functionality label Jan 9, 2019
@zeripath zeripath force-pushed the issue-4921-obey-http-log-settings branch from 3928da6 to 21e41f7 Compare January 13, 2019 08:27
@zeripath
Copy link
Contributor Author

zeripath commented Jan 15, 2019

Hmm. We should probably have this setting on by default. It would considerably reduce the amount of text that's spewed out during tests.


We should do this as a separate PR as the integration tests will require some logging before we do that.

@zeripath zeripath force-pushed the issue-4921-obey-http-log-settings branch from 21e41f7 to 408015c Compare January 15, 2019 20:56
@bkcsoft bkcsoft 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 Jan 15, 2019
@techknowlogick techknowlogick added this to the 1.8.0 milestone Jan 15, 2019
@zeripath zeripath force-pushed the issue-4921-obey-http-log-settings branch from cda22d1 to 57585bd Compare January 15, 2019 21:42
@zeripath
Copy link
Contributor Author

OK pushing the macaron logs to the files in the integration tests works but should be discussed in a different PR.

routers/routes/routes.go Outdated Show resolved Hide resolved
routers/routes/routes.go Show resolved Hide resolved
custom/conf/app.ini.sample Show resolved Hide resolved
Fix 4291

Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath force-pushed the issue-4921-obey-http-log-settings branch from 57585bd to cb3ddf1 Compare January 20, 2019 12:39
@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 Jan 25, 2019
@zeripath
Copy link
Contributor Author

@lunny Are you happy with the logs remaining at INFO for both Macaron and the router log?

@lunny lunny added the pr/breaking Merging this PR means builds will break. Needs a description what exactly breaks, and how to fix it! label Feb 6, 2019
@techknowlogick techknowlogick merged commit f286a5a into go-gitea:master Feb 6, 2019
@zeripath zeripath deleted the issue-4921-obey-http-log-settings branch April 22, 2019 20:22
@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.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. pr/breaking Merging this PR means builds will break. Needs a description what exactly breaks, and how to fix it! type/enhancement An improvement of existing functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Gitea is ignoring log settings (HTTP logs go to /var/log/syslog instead of http.log)
9 participants