This repository was archived by the owner on Sep 30, 2024. It is now read-only.
conf: Fix httpcli config#54745
Merged
Merged
Conversation
unknwon
approved these changes
Jul 10, 2023
cadbee6 to
cb69e4e
Compare
github-actions Bot
pushed a commit
that referenced
this pull request
Jul 10, 2023
(cherry picked from commit e715340)
coury-clark
pushed a commit
that referenced
this pull request
Jul 10, 2023
See [this comment](https://github.com/sourcegraph/sourcegraph/pull/52242/files#r1254598066) for the source issue. Looks like #52242 introduced a condition where certain httpcli settings were not being configured in the frontend due to some cyclic package dependency-avoidance trickery in the `conf.Init` function. This PR ensures that this setup code is hit in the frontend initialization process. No other service should need this (as they hit the `conf.Init` function directly from `SingleServiceMain` on startup), and no other feature should have been affected (as these are the only settings missing from that path). ## Test plan Tested locally. <br> Backport e715340 from #54745 Co-authored-by: Eric Fritz <eric@sourcegraph.com>
nelsonjr
pushed a commit
that referenced
this pull request
Jul 11, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See this comment for the source issue. Looks like #52242 introduced a condition where certain httpcli settings were not being configured in the frontend due to some cyclic package dependency-avoidance trickery in the
conf.Initfunction.This PR ensures that this setup code is hit in the frontend initialization process. No other service should need this (as they hit the
conf.Initfunction directly fromSingleServiceMainon startup), and no other feature should have been affected (as these are the only settings missing from that path).Test plan
Tested locally.