Merge pull request #1069 from skmatti/json-fix-1.9

Cherrypick #1066[Fix json tag for Logging]
kubernetes · Apr 6, 2020 · 78be425 · 78be425
2 parents 325af47 + faa1300
commit 78be425
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/apis/backendconfig/v1/types.go b/pkg/apis/backendconfig/v1/types.go
@@ -45,7 +45,7 @@ type BackendConfigSpec struct {
 	CustomRequestHeaders *CustomRequestHeadersConfig `json:"customRequestHeaders,omitempty"`
 	HealthCheck          *HealthCheckConfig          `json:"healthCheck,omitempty"`
 	// Logging specifies the configuration for access logs.
-	Logging *LogConfig `json:"log,omitempty"`
+	Logging *LogConfig `json:"logging,omitempty"`
 }
 
 // BackendConfigStatus is the status for a BackendConfig resource

diff --git a/pkg/backends/features/logging.go b/pkg/backends/features/logging.go
@@ -40,7 +40,7 @@ func EnsureLogging(sp utils.ServicePort, be *composite.BackendService) bool {
 	if be.LogConfig == nil || expectedLogConfig.Enable != be.LogConfig.Enable ||
 		expectedLogConfig.SampleRate != be.LogConfig.SampleRate {
 		be.LogConfig = expectedLogConfig
-		klog.V(2).Infof("Updated Logging settings for service %s", svcKey)
+		klog.V(2).Infof("Updated Logging settings for service %s(Enable: %t, SampleRate: %f)", svcKey, be.LogConfig.Enable, be.LogConfig.SampleRate)
 		return true
 	}
 	return false