From 517d11c67126bd97c88e2faabda0832fff482258 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 10 Apr 2024 06:55:46 +0000 Subject: [PATCH] Reduce log noise (#108) Cannot guarantee that all noisy logs can be removed at once. Comment them instead of removing them to make it easier to merge upstream. What have been removed in this PR are those that are very very long and almost unreadable logs, like image Reviewed-on: https://gitea.com/gitea/act/pulls/108 Reviewed-by: Lunny Xiao --- pkg/container/docker_network.go | 7 +++++-- pkg/container/docker_run.go | 9 ++++++--- pkg/runner/action.go | 6 ++++-- pkg/runner/step.go | 3 ++- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pkg/container/docker_network.go b/pkg/container/docker_network.go index 6c2676f..01df41d 100644 --- a/pkg/container/docker_network.go +++ b/pkg/container/docker_network.go @@ -6,6 +6,7 @@ import ( "context" "github.com/docker/docker/api/types" + "github.com/nektos/act/pkg/common" ) @@ -22,7 +23,8 @@ func NewDockerNetworkCreateExecutor(name string) common.Executor { if err != nil { return err } - common.Logger(ctx).Debugf("%v", networks) + // For Gitea, reduce log noise + // common.Logger(ctx).Debugf("%v", networks) for _, network := range networks { if network.Name == name { common.Logger(ctx).Debugf("Network %v exists", name) @@ -56,7 +58,8 @@ func NewDockerNetworkRemoveExecutor(name string) common.Executor { if err != nil { return err } - common.Logger(ctx).Debugf("%v", networks) + // For Gitea, reduce log noise + // common.Logger(ctx).Debugf("%v", networks) for _, network := range networks { if network.Name == name { result, err := cli.NetworkInspect(ctx, network.ID, types.NetworkInspectOptions{}) diff --git a/pkg/container/docker_run.go b/pkg/container/docker_run.go index 7767a65..51bde0f 100644 --- a/pkg/container/docker_run.go +++ b/pkg/container/docker_run.go @@ -445,7 +445,8 @@ func (cr *containerReference) create(capAdd []string, capDrop []string) common.E ExposedPorts: input.ExposedPorts, Tty: isTerminal, } - logger.Debugf("Common container.Config ==> %+v", config) + // For Gitea, reduce log noise + // logger.Debugf("Common container.Config ==> %+v", config) if len(input.Cmd) != 0 { config.Cmd = input.Cmd @@ -489,7 +490,8 @@ func (cr *containerReference) create(capAdd []string, capDrop []string) common.E PortBindings: input.PortBindings, AutoRemove: input.AutoRemove, } - logger.Debugf("Common container.HostConfig ==> %+v", hostConfig) + // For Gitea, reduce log noise + // logger.Debugf("Common container.HostConfig ==> %+v", hostConfig) config, hostConfig, err := cr.mergeContainerConfigs(ctx, config, hostConfig) if err != nil { @@ -500,7 +502,8 @@ func (cr *containerReference) create(capAdd []string, capDrop []string) common.E config, hostConfig = cr.sanitizeConfig(ctx, config, hostConfig) var networkingConfig *network.NetworkingConfig - logger.Debugf("input.NetworkAliases ==> %v", input.NetworkAliases) + // For Gitea, reduce log noise + // logger.Debugf("input.NetworkAliases ==> %v", input.NetworkAliases) n := hostConfig.NetworkMode // IsUserDefined and IsHost are broken on windows if n.IsUserDefined() && n != "host" && len(input.NetworkAliases) > 0 { diff --git a/pkg/runner/action.go b/pkg/runner/action.go index 416e5e4..ce38787 100644 --- a/pkg/runner/action.go +++ b/pkg/runner/action.go @@ -112,7 +112,8 @@ func readActionImpl(ctx context.Context, step *model.Step, actionDir string, act defer closer.Close() action, err := model.ReadAction(reader) - logger.Debugf("Read action %v from '%s'", action, "Unknown") + // For Gitea, reduce log noise + // logger.Debugf("Read action %v from '%s'", action, "Unknown") return action, err } @@ -162,7 +163,8 @@ func runActionImpl(step actionStep, actionDir string, remoteAction *remoteAction } action := step.getActionModel() - logger.Debugf("About to run action %v", action) + // For Gitea, reduce log noise + // logger.Debugf("About to run action %v", action) err := setupActionEnv(ctx, step, remoteAction) if err != nil { diff --git a/pkg/runner/step.go b/pkg/runner/step.go index c67b5b0..0233ef3 100644 --- a/pkg/runner/step.go +++ b/pkg/runner/step.go @@ -221,7 +221,8 @@ func setupEnv(ctx context.Context, step step) error { } } - common.Logger(ctx).Debugf("setupEnv => %v", *step.getEnv()) + // For Gitea, reduce log noise + // common.Logger(ctx).Debugf("setupEnv => %v", *step.getEnv()) return nil }