some trivial improvements (#621)

* don't log when get metrics * add node to pull log
projecteru2 · Oct 19, 2023 · 96b31aa · 96b31aa
1 parent 4b842ce
commit 96b31aa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cluster/calcium/helper.go b/cluster/calcium/helper.go
@@ -28,7 +28,7 @@ func distributionInspect(ctx context.Context, node *types.Node, image string, di
 
 // Pull an image
 func pullImage(ctx context.Context, node *types.Node, image string) error {
-	logger := log.WithFunc("calcium.pullImage").WithField("image", image)
+	logger := log.WithFunc("calcium.pullImage").WithField("node", node.Name).WithField("image", image)
 	logger.Info(ctx, "Pulling image")
 	if image == "" {
 		return types.ErrNoImage

diff --git a/metrics/metrics.go b/metrics/metrics.go
@@ -46,7 +46,6 @@ type Metrics struct {
 
 // SendDeployCount update deploy counter
 func (m *Metrics) SendDeployCount(ctx context.Context, n int) {
-	log.WithFunc("metrics.SendDeployCount").Info(ctx, "Update deploy counter")
 	metrics := &plugintypes.Metrics{
 		Name:   deployCountName,
 		Labels: []string{m.Hostname},
@@ -58,7 +57,6 @@ func (m *Metrics) SendDeployCount(ctx context.Context, n int) {
 }
 
 func (m *Metrics) SendPodNodeStatus(ctx context.Context, node *types.Node) {
-	log.WithFunc("metrics.SendPodNodeStatus").Info(ctx, "update pod node status")
 	up := !node.IsDown()
 	metrics := &plugintypes.Metrics{
 		Name:   podNodeStatusName,

diff --git a/resource/plugins/binary/call.go b/resource/plugins/binary/call.go
@@ -36,7 +36,9 @@ func (p Plugin) execCommand(ctx context.Context, cmd *exec.Cmd, req any) ([]byte
 	if err != nil {
 		return nil, err
 	}
-	logger.WithField("in", string(b)).WithField("cmd", cmd.String()).Info(ctx, "call params")
+	if len(cmd.Args) < 2 || cmd.Args[1] != GetMetricsCommand {
+		logger.WithField("in", string(b)).WithField("cmd", cmd.String()).Info(ctx, "call params")
+	}
 	cmd.Stdin = bytes.NewBuffer(b)
 	return cmd.CombinedOutput()
 }