Skip to content

Commit

Permalink
Lowercase all log strings (#3173)
Browse files Browse the repository at this point in the history
from #3161

---------

Co-authored-by: 6543 <6543@obermui.de>
  • Loading branch information
qwerty287 and 6543 authored Jan 11, 2024
1 parent f56f9cb commit b0a2b1c
Show file tree
Hide file tree
Showing 23 changed files with 82 additions and 81 deletions.
2 changes: 1 addition & 1 deletion cli/loglevel/loglevel.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@ func logLevel(c *cli.Context) error {
}
}

log.Info().Msgf("Logging level: %s", ll.Level)
log.Info().Msgf("logging level: %s", ll.Level)
return nil
}
16 changes: 8 additions & 8 deletions cmd/agent/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,15 @@ func run(c *cli.Context) error {

agentConfigPersisted := abool.New()
ctx = utils.WithContextSigtermCallback(ctx, func() {
log.Info().Msg("Termination signal is received, shutting down")
log.Info().Msg("termination signal is received, shutting down")
sigterm.Set()

// Remove stateless agents from server
if agentConfigPersisted.IsNotSet() {
log.Debug().Msg("Unregistering agent from server")
log.Debug().Msg("unregistering agent from server")
err := client.UnregisterAgent(ctx)
if err != nil {
log.Err(err).Msg("Failed to unregister agent from server")
log.Err(err).Msg("failed to unregister agent from server")
}
}
})
Expand All @@ -142,7 +142,7 @@ func run(c *cli.Context) error {
}
if grpcServerVersion.GrpcVersion != agentRpc.ClientGrpcVersion {
err := errors.New("GRPC version mismatch")
log.Error().Err(err).Msgf("Server version %s does report grpc version %d but we only understand %d",
log.Error().Err(err).Msgf("server version %s does report grpc version %d but we only understand %d",
grpcServerVersion.ServerVersion,
grpcServerVersion.GrpcVersion,
agentRpc.ClientGrpcVersion)
Expand Down Expand Up @@ -199,18 +199,18 @@ func run(c *cli.Context) error {
Labels: labels,
}

log.Debug().Msgf("Agent registered with ID %d", agentConfig.AgentID)
log.Debug().Msgf("agent registered with ID %d", agentConfig.AgentID)

go func() {
for {
if sigterm.IsSet() {
log.Debug().Msg("Terminating health reporting")
log.Debug().Msg("terminating health reporting")
return
}

err := client.ReportHealth(ctx)
if err != nil {
log.Err(err).Msg("Failed to report health")
log.Err(err).Msg("failed to report health")
return
}

Expand Down Expand Up @@ -242,7 +242,7 @@ func run(c *cli.Context) error {
}

log.Info().Msgf(
"Starting Woodpecker agent with version '%s' and backend '%s' using platform '%s' running up to %d pipelines in parallel",
"starting Woodpecker agent with version '%s' and backend '%s' using platform '%s' running up to %d pipelines in parallel",
version.String(), backendEngine.Name(), engInfo.Platform, parallel)

wg.Wait()
Expand Down
2 changes: 1 addition & 1 deletion cmd/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ func run(c *cli.Context) error {
})
}

log.Info().Msgf("Starting Woodpecker server with version '%s'", version.String())
log.Info().Msgf("starting Woodpecker server with version '%s'", version.String())

return g.Wait()
}
Expand Down
8 changes: 4 additions & 4 deletions cmd/server/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func setupBitbucket(c *cli.Context) (forge.Forge, error) {
Client: c.String("bitbucket-client"),
Secret: c.String("bitbucket-secret"),
}
log.Trace().Msgf("Forge (bitbucket) opts: %#v", opts)
log.Trace().Msgf("forge (bitbucket) opts: %#v", opts)
return bitbucket.New(opts)
}

Expand All @@ -206,7 +206,7 @@ func setupGitea(c *cli.Context) (forge.Forge, error) {
if len(opts.URL) == 0 {
return nil, fmt.Errorf("WOODPECKER_GITEA_URL must be set")
}
log.Trace().Msgf("Forge (gitea) opts: %#v", opts)
log.Trace().Msgf("forge (gitea) opts: %#v", opts)
return gitea.New(opts)
}

Expand All @@ -229,7 +229,7 @@ func setupGitHub(c *cli.Context) (forge.Forge, error) {
SkipVerify: c.Bool("github-skip-verify"),
MergeRef: c.Bool("github-merge-ref"),
}
log.Trace().Msgf("Forge (github) opts: %#v", opts)
log.Trace().Msgf("forge (github) opts: %#v", opts)
return github.New(opts)
}

Expand Down Expand Up @@ -307,7 +307,7 @@ func setupSignatureKeys(_store store.Store) (crypto.PrivateKey, crypto.PublicKey
if err != nil {
return nil, nil, fmt.Errorf("failed to store private key: %w", err)
}
log.Debug().Msg("Created private key")
log.Debug().Msg("created private key")
return privKey, privKey.Public(), nil
} else if err != nil {
return nil, nil, fmt.Errorf("failed to load private key: %w", err)
Expand Down
12 changes: 6 additions & 6 deletions pipeline/backend/kubernetes/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ func (e *kube) SetupWorkflow(ctx context.Context, conf *types.Config, taskUUID s
}
}
}
log.Trace().Msgf("Adding extra hosts: %v", extraHosts)
log.Trace().Msgf("adding extra hosts: %v", extraHosts)
for _, stage := range conf.Stages {
for _, step := range stage.Steps {
step.ExtraHosts = extraHosts
Expand All @@ -201,7 +201,7 @@ func (e *kube) StartStep(ctx context.Context, step *types.Step, taskUUID string)
log.Trace().Msgf("StartStep got service '%s', ignoring it.", step.Name)
return nil
}
log.Trace().Str("taskUUID", taskUUID).Msgf("Starting step: %s", step.Name)
log.Trace().Str("taskUUID", taskUUID).Msgf("starting step: %s", step.Name)
_, err := startPod(ctx, e, step)
return err
}
Expand All @@ -214,7 +214,7 @@ func (e *kube) WaitStep(ctx context.Context, step *types.Step, taskUUID string)
return nil, err
}

log.Trace().Str("taskUUID", taskUUID).Msgf("Waiting for pod: %s", podName)
log.Trace().Str("taskUUID", taskUUID).Msgf("waiting for pod: %s", podName)

finished := make(chan bool)

Expand Down Expand Up @@ -274,7 +274,7 @@ func (e *kube) TailStep(ctx context.Context, step *types.Step, taskUUID string)
return nil, err
}

log.Trace().Str("taskUUID", taskUUID).Msgf("Tail logs of pod: %s", podName)
log.Trace().Str("taskUUID", taskUUID).Msgf("tail logs of pod: %s", podName)

up := make(chan bool)

Expand Down Expand Up @@ -340,14 +340,14 @@ func (e *kube) DestroyStep(_ context.Context, step *types.Step, taskUUID string)
log.Trace().Msgf("DestroyStep got service '%s', ignoring it.", step.Name)
return nil
}
log.Trace().Str("taskUUID", taskUUID).Msgf("Stopping step: %s", step.Name)
log.Trace().Str("taskUUID", taskUUID).Msgf("stopping step: %s", step.Name)
err := stopPod(e.ctx, e, step, defaultDeleteOptions)
return err
}

// Destroy the pipeline environment.
func (e *kube) DestroyWorkflow(_ context.Context, conf *types.Config, taskUUID string) error {
log.Trace().Str("taskUUID", taskUUID).Msg("Deleting Kubernetes primitives")
log.Trace().Str("taskUUID", taskUUID).Msg("deleting Kubernetes primitives")

// Use noContext because the ctx sent to this function will be canceled/done in case of error or canceled by user.
for _, stage := range conf.Stages {
Expand Down
16 changes: 8 additions & 8 deletions pipeline/backend/kubernetes/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ func hostAlias(extraHost types.HostAlias) v1.HostAlias {
}

func imagePullSecretsReferences(imagePullSecretNames []string) []v1.LocalObjectReference {
log.Trace().Msgf("Using the image pull secrets: %v", imagePullSecretNames)
log.Trace().Msgf("using the image pull secrets: %v", imagePullSecretNames)

secretReferences := make([]v1.LocalObjectReference, len(imagePullSecretNames))
for i, imagePullSecretName := range imagePullSecretNames {
Expand Down Expand Up @@ -256,11 +256,11 @@ func nodeSelector(backendNodeSelector map[string]string, platform string) map[st
if platform != "" {
arch := strings.Split(platform, "/")[1]
nodeSelector[v1.LabelArchStable] = arch
log.Trace().Msgf("Using the node selector from the Agent's platform: %v", nodeSelector)
log.Trace().Msgf("using the node selector from the Agent's platform: %v", nodeSelector)
}

if len(backendNodeSelector) > 0 {
log.Trace().Msgf("Appending labels to the node selector from the backend options: %v", backendNodeSelector)
log.Trace().Msgf("appending labels to the node selector from the backend options: %v", backendNodeSelector)
maps.Copy(nodeSelector, backendNodeSelector)
}

Expand All @@ -271,7 +271,7 @@ func tolerations(backendTolerations []types.Toleration) []v1.Toleration {
var tolerations []v1.Toleration

if len(backendTolerations) > 0 {
log.Trace().Msgf("Tolerations that will be used in the backend options: %v", backendTolerations)
log.Trace().Msgf("tolerations that will be used in the backend options: %v", backendTolerations)
for _, backendToleration := range backendTolerations {
toleration := toleration(backendToleration)
tolerations = append(tolerations, toleration)
Expand Down Expand Up @@ -323,7 +323,7 @@ func podSecurityContext(sc *types.SecurityContext, secCtxConf SecurityContextCon
RunAsGroup: group,
FSGroup: fsGroup,
}
log.Trace().Msgf("Pod security context that will be used: %v", securityContext)
log.Trace().Msgf("pod security context that will be used: %v", securityContext)
return securityContext
}

Expand All @@ -343,7 +343,7 @@ func containerSecurityContext(sc *types.SecurityContext, stepPrivileged bool) *v
securityContext := &v1.SecurityContext{
Privileged: privileged,
}
log.Trace().Msgf("Container security context that will be used: %v", securityContext)
log.Trace().Msgf("container security context that will be used: %v", securityContext)
return securityContext
}

Expand All @@ -368,7 +368,7 @@ func startPod(ctx context.Context, engine *kube, step *types.Step) (*v1.Pod, err
return nil, err
}

log.Trace().Msgf("Creating pod: %s", pod.Name)
log.Trace().Msgf("creating pod: %s", pod.Name)
return engine.client.CoreV1().Pods(engine.config.Namespace).Create(ctx, pod, metav1.CreateOptions{})
}

Expand All @@ -377,7 +377,7 @@ func stopPod(ctx context.Context, engine *kube, step *types.Step, deleteOpts met
if err != nil {
return err
}
log.Trace().Str("name", podName).Msg("Deleting pod")
log.Trace().Str("name", podName).Msg("deleting pod")

err = engine.client.CoreV1().Pods(engine.config.Namespace).Delete(ctx, podName, deleteOpts)
if errors.IsNotFound(err) {
Expand Down
7 changes: 4 additions & 3 deletions pipeline/backend/kubernetes/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ import (
"fmt"

"github.com/rs/zerolog/log"
"go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"

"go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types"
)

const (
Expand Down Expand Up @@ -81,12 +82,12 @@ func stopService(ctx context.Context, engine *kube, step *types.Step, deleteOpts
if err != nil {
return err
}
log.Trace().Str("name", svcName).Msg("Deleting service")
log.Trace().Str("name", svcName).Msg("deleting service")

err = engine.client.CoreV1().Services(engine.config.Namespace).Delete(ctx, svcName, deleteOpts)
if errors.IsNotFound(err) {
// Don't abort on 404 errors from k8s, they most likely mean that the pod hasn't been created yet, usually because pipeline was canceled before running all steps.
log.Trace().Err(err).Msgf("Unable to delete service %s", svcName)
log.Trace().Err(err).Msgf("unable to delete service %s", svcName)
return nil
}
return err
Expand Down
6 changes: 3 additions & 3 deletions pipeline/backend/kubernetes/volume.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func startVolume(ctx context.Context, engine *kube, name string) (*v1.Persistent
return nil, err
}

log.Trace().Msgf("Creating volume: %s", pvc.Name)
log.Trace().Msgf("creating volume: %s", pvc.Name)
return engine.client.CoreV1().PersistentVolumeClaims(engine.config.Namespace).Create(ctx, pvc, metav1.CreateOptions{})
}

Expand All @@ -90,12 +90,12 @@ func stopVolume(ctx context.Context, engine *kube, name string, deleteOpts metav
if err != nil {
return err
}
log.Trace().Str("name", pvcName).Msg("Deleting volume")
log.Trace().Str("name", pvcName).Msg("deleting volume")

err = engine.client.CoreV1().PersistentVolumeClaims(engine.config.Namespace).Delete(ctx, pvcName, deleteOpts)
if errors.IsNotFound(err) {
// Don't abort on 404 errors from k8s, they most likely mean that the pod hasn't been created yet, usually because pipeline was canceled before running all steps.
log.Trace().Err(err).Msgf("Unable to delete service %s", pvcName)
log.Trace().Err(err).Msgf("unable to delete service %s", pvcName)
return nil
}
return err
Expand Down
2 changes: 1 addition & 1 deletion pipeline/pipeline.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func (r *Runtime) MakeLogger() zerolog.Logger {
// Starts the execution of an workflow and waits for it to complete
func (r *Runtime) Run(runnerCtx context.Context) error {
logger := r.MakeLogger()
logger.Debug().Msgf("Executing %d stages, in order of:", len(r.spec.Stages))
logger.Debug().Msgf("executing %d stages, in order of:", len(r.spec.Stages))
for stagePos, stage := range r.spec.Stages {
stepNames := []string{}
for _, step := range stage.Steps {
Expand Down
6 changes: 3 additions & 3 deletions server/api/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func HandleAuth(c *gin.Context) {
if server.Config.Permissions.Orgs.IsConfigured {
teams, terr := _forge.Teams(c, tmpuser)
if terr != nil || !server.Config.Permissions.Orgs.IsMember(teams) {
log.Error().Err(terr).Msgf("cannot verify team membership for %s.", u.Login)
log.Error().Err(terr).Msgf("cannot verify team membership for %s", u.Login)
c.Redirect(303, server.Config.Server.RootPath+"/login?error=access_denied")
return
}
Expand Down Expand Up @@ -130,7 +130,7 @@ func HandleAuth(c *gin.Context) {
if server.Config.Permissions.Orgs.IsConfigured {
teams, terr := _forge.Teams(c, u)
if terr != nil || !server.Config.Permissions.Orgs.IsMember(teams) {
log.Error().Err(terr).Msgf("cannot verify team membership for %s.", u.Login)
log.Error().Err(terr).Msgf("cannot verify team membership for %s", u.Login)
c.Redirect(http.StatusSeeOther, server.Config.Server.RootPath+"/login?error=access_denied")
return
}
Expand Down Expand Up @@ -166,7 +166,7 @@ func HandleAuth(c *gin.Context) {
continue
}

log.Debug().Msgf("Synced user permission for %s %s", u.Login, dbRepo.FullName)
log.Debug().Msgf("synced user permission for %s %s", u.Login, dbRepo.FullName)
perm := forgeRepo.Perm
perm.Repo = dbRepo
perm.RepoID = dbRepo.ID
Expand Down
2 changes: 1 addition & 1 deletion server/api/org.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func LookupOrg(c *gin.Context) {
} else if !user.Admin {
perm, err := server.Config.Services.Membership.Get(c, user, org.Name)
if err != nil {
log.Error().Err(err).Msg("Failed to check membership")
log.Error().Err(err).Msg("failed to check membership")
c.Status(http.StatusInternalServerError)
return
}
Expand Down
12 changes: 6 additions & 6 deletions server/api/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func PostRepo(c *gin.Context) {
c.String(http.StatusConflict, "Repository is already active.")
return
} else if err != nil && !errors.Is(err, types.RecordNotExist) {
msg := "Could not get repo by remote id from store."
msg := "could not get repo by remote id from store."
log.Error().Err(err).Msg(msg)
c.String(http.StatusInternalServerError, msg)
return
Expand Down Expand Up @@ -115,7 +115,7 @@ func PostRepo(c *gin.Context) {
t := token.New(token.HookToken, repo.FullName)
sig, err := t.Sign(repo.Hash)
if err != nil {
msg := "Could not generate new jwt token."
msg := "could not generate new jwt token."
log.Error().Err(err).Msg(msg)
c.String(http.StatusInternalServerError, msg)
return
Expand All @@ -139,15 +139,15 @@ func PostRepo(c *gin.Context) {
if errors.Is(err, types.RecordNotExist) {
org, err = forge.Org(c, user, repo.Owner)
if err != nil {
msg := "Could not fetch organization from forge."
msg := "could not fetch organization from forge."
log.Error().Err(err).Msg(msg)
c.String(http.StatusInternalServerError, msg)
return
}

err = _store.OrgCreate(org)
if err != nil {
msg := "Could not create organization in store."
msg := "could not create organization in store."
log.Error().Err(err).Msg(msg)
c.String(http.StatusInternalServerError, msg)
return
Expand All @@ -158,7 +158,7 @@ func PostRepo(c *gin.Context) {

err = forge.Activate(c, user, repo, hookURL)
if err != nil {
msg := "Could not create webhook in forge."
msg := "could not create webhook in forge."
log.Error().Err(err).Msg(msg)
c.String(http.StatusInternalServerError, msg)
return
Expand All @@ -170,7 +170,7 @@ func PostRepo(c *gin.Context) {
err = _store.CreateRepo(repo)
}
if err != nil {
msg := "Could not create/update repo in store."
msg := "could not create/update repo in store."
log.Error().Err(err).Msg(msg)
c.String(http.StatusInternalServerError, msg)
return
Expand Down
Loading

0 comments on commit b0a2b1c

Please sign in to comment.