Skip to content

Commit 8203e27

Browse files
committed
Add one more log
1 parent d985cd3 commit 8203e27

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

internal/controller/nginx/agent/agent.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (n *NginxUpdaterImpl) UpdateConfig(
8888
deployment *Deployment,
8989
files []File,
9090
) {
91-
msg := deployment.SetFiles(files)
91+
msg := deployment.SetFiles(files, n.logger)
9292
if msg == nil {
9393
return
9494
}

internal/controller/nginx/agent/agent_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func TestUpdateConfig_NoChange(t *testing.T) {
104104
}
105105

106106
// Set the initial files on the deployment
107-
deployment.SetFiles([]File{file})
107+
deployment.SetFiles([]File{file}, updater.logger)
108108

109109
// Call UpdateConfig with the same files
110110
updater.UpdateConfig(deployment, []File{file})

internal/controller/nginx/agent/command_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ func TestSubscribe(t *testing.T) {
328328
Contents: []byte("file contents"),
329329
},
330330
}
331-
deployment.SetFiles(files)
331+
deployment.SetFiles(files, logr.Discard())
332332

333333
initialAction := &pb.NGINXPlusAction{
334334
Action: &pb.NGINXPlusAction_UpdateHttpUpstreamServers{},
@@ -457,7 +457,7 @@ func TestSubscribe_Reset(t *testing.T) {
457457
Contents: []byte("file contents"),
458458
},
459459
}
460-
deployment.SetFiles(files)
460+
deployment.SetFiles(files, logr.Discard())
461461

462462
ctx, cancel := createGrpcContextWithCancel()
463463
defer cancel()

internal/controller/nginx/agent/deployment.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"fmt"
77
"sync"
88

9+
"github.com/go-logr/logr"
910
pb "github.com/nginx/agent/v3/api/grpc/mpi/v1"
1011
filesHelper "github.com/nginx/agent/v3/pkg/files"
1112
"k8s.io/apimachinery/pkg/types"
@@ -173,7 +174,7 @@ func (d *Deployment) GetFile(name, hash string) []byte {
173174

174175
// SetFiles updates the nginx files and fileOverviews for the deployment and returns the message to send.
175176
// The deployment FileLock MUST already be locked before calling this function.
176-
func (d *Deployment) SetFiles(files []File) *broadcast.NginxAgentMessage {
177+
func (d *Deployment) SetFiles(files []File, logger logr.Logger) *broadcast.NginxAgentMessage {
177178
d.files = files
178179

179180
fileOverviews := make([]*pb.File, 0, len(files))
@@ -197,6 +198,7 @@ func (d *Deployment) SetFiles(files []File) *broadcast.NginxAgentMessage {
197198
newConfigVersion := filesHelper.GenerateConfigVersion(fileOverviews)
198199
if d.configVersion == newConfigVersion {
199200
// files have not changed, nothing to send
201+
logger.V(1).Info("No changes to nginx configuration files, not sending to agent")
200202
return nil
201203
}
202204

internal/controller/nginx/agent/deployment_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"errors"
66
"testing"
77

8+
"github.com/go-logr/logr"
89
pb "github.com/nginx/agent/v3/api/grpc/mpi/v1"
910
. "github.com/onsi/gomega"
1011
"k8s.io/apimachinery/pkg/types"
@@ -44,7 +45,7 @@ func TestSetAndGetFiles(t *testing.T) {
4445
},
4546
}
4647

47-
msg := deployment.SetFiles(files)
48+
msg := deployment.SetFiles(files, logr.Discard())
4849
fileOverviews, configVersion := deployment.GetFileOverviews()
4950

5051
g.Expect(msg.Type).To(Equal(broadcast.ConfigApplyRequest))
@@ -59,7 +60,7 @@ func TestSetAndGetFiles(t *testing.T) {
5960
g.Expect(deployment.GetFile("test.conf", "invalid")).To(BeNil())
6061

6162
// Set the same files again
62-
msg = deployment.SetFiles(files)
63+
msg = deployment.SetFiles(files, logr.Discard())
6364
g.Expect(msg).To(BeNil())
6465

6566
newFileOverviews, _ := deployment.GetFileOverviews()

0 commit comments

Comments
 (0)