Use route rather than use thus reducing the number of stack frames #15301

zeripath · 2021-04-06T08:38:40Z

Since the move to Chi the number of stack frames has proliferated somewhat catastrophically and we're up to 96 frames with multiple tests of the url outside of a trie which is inefficient.

This PR reduces the number of stack frames by 6 through careful use of Route, moves Captcha into its own router so that it only fires on Captcha routes, similarly for avatars and repo-avatars.

The robots.txt, / and apple-touch-icon.png are moved out of requiring Contexter.

It moves access logger higher in the stack frame because there is no reason why it can't be higher.

Extract from #15186
Contains #15292

Simplify the web.go FCGI path by moving the req.URL.Path fix-up to listener Signed-off-by: Andrew Thornton <art27@cantab.net>

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

…stack Signed-off-by: Andrew Thornton <art27@cantab.net>

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

silverwind · 2021-04-06T22:07:21Z

routers/routes/web.go

+	// this png is very likely to always be below the limit for gzip so it doesn't need to pass through gzip
+	routes.Get("/apple-touch-icon.png", func(w http.ResponseWriter, req *http.Request) {
+		http.Redirect(w, req, path.Join(setting.StaticURLPrefix, "img/apple-touch-icon.png"), 301)
+	})


Can probably nuke that route and make it use a <link> tag to directly link to the image. I recall this route was only there for some edge case with Firefox, but it should be favoring the SVG icon over this one nowadays.

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

…an-use

zeripath · 2021-05-04T21:46:39Z

Make lgtm work

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf · 2021-05-04T22:29:21Z

after upgrading to this the user-specified avatars won't load.. I'm not sure if that's intentional, it's potentially kind/breaking.

EDIT: org avatars won't load at all (no matter if user-specified or gravatar)
EDIT2: org avatars that should be loaded from gravatar are grabbed from local instance, (/avatars/jfkdjfsdkfjksfkjsdf), which, of course, fails (unless there's supposed to be a redirection to gravatar in the background that I'm not aware of)

zeripath · 2021-05-04T22:32:55Z

Not intentional at all - I thought I'd tested all of this.

It might be that it's reverted your recent fix as this was written before it.

Do you remember your pr that fixed things?

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf · 2021-05-04T22:37:21Z

Not intentional at all - I thought I'd tested all of this.

No worries.

It might be that it's reverted your recent fix as this was written before it.

Do you remember your pr that fixed things?

There was this thing with assets, should I check that?
I'll go revert that my fix (moving things to /assets/{img,css,*}/...) and report back.

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf · 2021-05-04T22:40:31Z

looks like custom css still works fine and so do custom /assets-based icons.
this is different, though, this does not pertain customizations, rather /avatars stuff

so the answer is I don't recal what PR could be the partial cause other than the assets one @zeripath
the issue is as described above, org avatars that should be fetched from gravatar are looked for locally, user avatars that are user-supplied are 404s.

I do think this is really worth doing so fixing the problem rather than reverting this pr should be the aim.

I am all for it.

prometheus metrics look fine, though :D

zeripath · 2021-05-04T22:44:30Z

Unfortunately there was quite a few prs between this being written and it getting approved - I bet something to do with the assets move is the cause.

I should have rechecked before merging.

I do think this is really worth doing so fixing the problem rather than reverting this pr should be the aim.

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf · 2021-05-04T23:02:39Z

I have done a quick write-up of the issue so that I don't pollute this PR anymore

There was a missing * from the avatars routes in go-gitea#15301. Fix go-gitea#15727 Signed-off-by: Andrew Thornton <art27@cantab.net>

There was a missing * from the avatars routes in #15301. Fix #15727 Signed-off-by: Andrew Thornton <art27@cantab.net>

zeripath added 4 commits April 5, 2021 21:13

Move FCGI req.URL.Path fix-up to the FCGI listener

eca7276

Simplify the web.go FCGI path by moving the req.URL.Path fix-up to listener Signed-off-by: Andrew Thornton <art27@cantab.net>

Merge branch 'master' into simplify-fcgi-requrl-path-fixing

668482e

move access logger to common as it is a logger

50b9f77

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

Use routes.Route not routes.Use to reduce the number of calls on the …

83dc5c0

…stack Signed-off-by: Andrew Thornton <art27@cantab.net>

zeripath added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label Apr 6, 2021

zeripath added this to the 1.15.0 milestone Apr 6, 2021

zeripath added 2 commits April 6, 2021 10:01

remove duplicate access log call

ed44d2e

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

Merge branch 'master' into use-route-rather-than-use

d4c05ff

silverwind reviewed Apr 6, 2021

View reviewed changes

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 6, 2021

zeripath added 4 commits April 7, 2021 09:48

add api/swagger back in

56ff032

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

add api/swagger back in

d9e1432

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

Merge remote-tracking branch 'origin/master' into use-route-rather-th…

57a4c52

…an-use

Merge branch 'master' into use-route-rather-than-use

1969370

KN4CK3R approved these changes May 4, 2021

View reviewed changes

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 4, 2021

silverwind approved these changes May 4, 2021

View reviewed changes

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 4, 2021

Merge branch 'main' into use-route-rather-than-use

46f764e

zeripath merged commit 47fd156 into go-gitea:main May 4, 2021

zeripath deleted the use-route-rather-than-use branch May 4, 2021 21:48

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf mentioned this pull request May 4, 2021

Avatars missing after recent upgrade (47fd15693) #15727

Closed

2 tasks

zeripath added a commit to zeripath/gitea that referenced this pull request May 5, 2021

Fix broken avatars since go-gitea#15301

98165a1

There was a missing * from the avatars routes in go-gitea#15301. Fix go-gitea#15727 Signed-off-by: Andrew Thornton <art27@cantab.net>

zeripath mentioned this pull request May 5, 2021

Fix broken avatars since #15301 #15731

Merged

zeripath added a commit that referenced this pull request May 5, 2021

Fix broken avatars since #15301 (#15731)

eed88dc

There was a missing * from the avatars routes in #15301. Fix #15727 Signed-off-by: Andrew Thornton <art27@cantab.net>

zeripath mentioned this pull request May 9, 2021

Discussion of v1.15.x Roadmap #14477

Closed

12 tasks

go-gitea locked and limited conversation to collaborators Jun 4, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use route rather than use thus reducing the number of stack frames #15301

Use route rather than use thus reducing the number of stack frames #15301

zeripath commented Apr 6, 2021 •

edited

Loading

silverwind Apr 6, 2021

zeripath commented May 4, 2021

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf commented May 4, 2021 •

edited

Loading

zeripath commented May 4, 2021

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf commented May 4, 2021

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf commented May 4, 2021 •

edited

Loading

zeripath commented May 4, 2021

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf commented May 4, 2021

Use route rather than use thus reducing the number of stack frames #15301

Use route rather than use thus reducing the number of stack frames #15301

Conversation

zeripath commented Apr 6, 2021 • edited Loading

silverwind Apr 6, 2021

Choose a reason for hiding this comment

zeripath commented May 4, 2021

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf commented May 4, 2021 • edited Loading

zeripath commented May 4, 2021

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf commented May 4, 2021

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf commented May 4, 2021 • edited Loading

zeripath commented May 4, 2021

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf commented May 4, 2021

zeripath commented Apr 6, 2021 •

edited

Loading

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf commented May 4, 2021 •

edited

Loading

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf commented May 4, 2021 •

edited

Loading