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

worker: move api.BasePath setup to the start of the funcs #4328

Merged
merged 1 commit into from
Aug 28, 2024
Merged

worker: move api.BasePath setup to the start of the funcs #4328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions internal/worker/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,12 @@ type tokenResponse struct {
}

func NewClient(conf ClientConfig) (*Client, error) {
api.BasePath = conf.BasePath

serverURL, err := url.Parse(conf.BaseURL)
if err != nil {
return nil, err
}

api.BasePath = conf.BasePath

serverURL, err = serverURL.Parse(api.BasePath + "/")
if err != nil {
panic(err)
Expand Down Expand Up @@ -131,13 +130,12 @@ func NewClient(conf ClientConfig) (*Client, error) {
}

func NewClientUnix(conf ClientConfig) *Client {
api.BasePath = conf.BasePath

serverURL, err := url.Parse("http://localhost/")
if err != nil {
panic(err)
}

api.BasePath = conf.BasePath

serverURL, err = serverURL.Parse(api.BasePath + "/")
if err != nil {
panic(err)
Expand Down
Loading