DevFW-CICD/ingress-nginx-helm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3377 from SataQiu/fix-20181107

Browse source 
Fix typos and default value
This commit is contained in:
k8s-ci-robot 2018-11-07 03:42:04 -08:00 committed by GitHub
commit b5a43db683
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/ingress/defaults/main.go
View file

@ -80,7 +80,7 @@ type Backend struct {
// Sets the replacement text that should be changed in the "Location" and "Refresh" header fields of a proxied server response. // Sets the replacement text that should be changed in the "Location" and "Refresh" header fields of a proxied server response.
// http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_redirect // http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_redirect
// Default: "" // Default: off
ProxyRedirectTo string `json:"proxy-redirect-to"` ProxyRedirectTo string `json:"proxy-redirect-to"`
// Enables or disables buffering of a client request body. // Enables or disables buffering of a client request body.

4
internal/ingress/metric/collectors/socket.go
View file

@ -208,11 +208,11 @@ func NewSocketCollector(pod, namespace, class string) (*SocketCollector, error)
func (sc *SocketCollector) handleMessage(msg []byte) { func (sc *SocketCollector) handleMessage(msg []byte) {
glog.V(5).Infof("msg: %v", string(msg)) glog.V(5).Infof("msg: %v", string(msg))
// Unmarshall bytes // Unmarshal bytes
var statsBatch []socketData var statsBatch []socketData
err := jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal(msg, &statsBatch) err := jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal(msg, &statsBatch)
if err != nil { if err != nil {
glog.Errorf("Unexpected error deserializing JSON paylod: %v. Payload:\n%v", err, string(msg)) glog.Errorf("Unexpected error deserializing JSON payload: %v. Payload:\n%v", err, string(msg))
return return
} }