Skip to content

Standardise HTTPServer and StreamServer data types #5

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

Merged
merged 1 commit into from
Jun 18, 2018
Merged

Standardise HTTPServer and StreamServer data types #5

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
6 changes: 3 additions & 3 deletions client/nginx_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ type UpstreamServer struct {

// StreamUpstreamServer lets you configure Stream upstreams.
type StreamUpstreamServer struct {
ID int64 `json:"id,omitempty"`
ID int `json:"id,omitempty"`
Server string `json:"server"`
MaxFails int64 `json:"max_fails"`
MaxFails int `json:"max_fails"`
FailTimeout string `json:"fail_timeout,omitempty"`
SlowStart string `json:"slow_start,omitempty"`
}
Expand Down Expand Up @@ -527,7 +527,7 @@ func (client *NginxClient) UpdateStreamServers(upstream string, servers []Stream
return toAdd, toDelete, nil
}

func (client *NginxClient) getIDOfStreamServer(upstream string, name string) (int64, error) {
func (client *NginxClient) getIDOfStreamServer(upstream string, name string) (int, error) {
servers, err := client.GetStreamServers(upstream)
if err != nil {
return -1, fmt.Errorf("error getting id of stream server %v of upstream %v: %v", name, upstream, err)
Expand Down