baladiwei
/
agola
mirror of https://github.com/agola-io/agola
0
0
Fork 0
Code Issues Releases Wiki Activity

*: use log Msg when passing a string. 

When passing a simple string don't used Msgf but just Msg.
This commit is contained in:
Simone Gotti 2024-10-24 15:58:53 +02:00
parent 0887406f1b
commit 80aa1f52d9
49 changed files with 153 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/agola/cmd/directrunstart.go
View File

@ -183,7 +183,7 @@ func directRunStart(cmd *cobra.Command, args []string) error {
return errors.WithStack(err)
}
log.Info().Msgf("pushing branch")
log.Info().Msg("pushing branch")
repoPath := fmt.Sprintf("%s/%s", user.ID, repoUUID)
repoURL := fmt.Sprintf("%s/repos/%s/%s.git", gatewayURL, user.ID, repoUUID)
@ -202,7 +202,7 @@ func directRunStart(cmd *cobra.Command, args []string) error {
}
}
log.Info().Msgf("starting direct run")
log.Info().Msg("starting direct run")
req := &gwapitypes.UserCreateRunRequest{
RepoUUID: repoUUID,
RepoPath: repoPath,

2
cmd/agola/cmd/logdelete.go
View File

@ -123,7 +123,7 @@ func logDelete(cmd *cobra.Command, args []string) error {
taskid = task.ID
}
log.Info().Msgf("deleting log")
log.Info().Msg("deleting log")
var err error
if isProject {

2
cmd/agola/cmd/logget.go
View File

@ -133,7 +133,7 @@ func logGet(cmd *cobra.Command, args []string) error {
taskid = task.ID
}
log.Info().Msgf("getting log")
log.Info().Msg("getting log")
var resp *gwclient.Response
var err error

2
cmd/agola/cmd/orgcreate.go
View File

@ -68,7 +68,7 @@ func orgCreate(cmd *cobra.Command, args []string) error {
Visibility: gwapitypes.Visibility(orgCreateOpts.visibility),
}
log.Info().Msgf("creating org")
log.Info().Msg("creating org")
org, _, err := gwClient.CreateOrg(context.TODO(), req)
if err != nil {
return errors.Wrapf(err, "failed to create org")

2
cmd/agola/cmd/projectcreate.go
View File

@ -102,7 +102,7 @@ func projectCreate(cmd *cobra.Command, args []string) error {
PassVarsToForkedPR: projectCreateOpts.passVarsToForkedPR,
}
log.Info().Msgf("creating project")
log.Info().Msg("creating project")
project, _, err := gwClient.CreateProject(context.TODO(), req)
if err != nil {

2
cmd/agola/cmd/projectdelete.go
View File

@ -55,7 +55,7 @@ func init() {
func projectDelete(cmd *cobra.Command, args []string) error {
gwClient := gwclient.NewClient(gatewayURL, token)
log.Info().Msgf("deleting project")
log.Info().Msg("deleting project")
if _, err := gwClient.DeleteProject(context.TODO(), projectDeleteOpts.ref); err != nil {
return errors.Wrapf(err, "failed to delete project")

2
cmd/agola/cmd/projectgroupcreate.go
View File

@ -74,7 +74,7 @@ func projectGroupCreate(cmd *cobra.Command, args []string) error {
Visibility: gwapitypes.Visibility(projectGroupCreateOpts.visibility),
}
log.Info().Msgf("creating project group")
log.Info().Msg("creating project group")
projectGroup, _, err := gwClient.CreateProjectGroup(context.TODO(), req)
if err != nil {

2
cmd/agola/cmd/projectgroupdelete.go
View File

@ -55,7 +55,7 @@ func init() {
func projectGroupDelete(cmd *cobra.Command, args []string) error {
gwClient := gwclient.NewClient(gatewayURL, token)
log.Info().Msgf("deleting project group")
log.Info().Msg("deleting project group")
if _, err := gwClient.DeleteProjectGroup(context.TODO(), projectGroupDeleteOpts.ref); err != nil {
return errors.Wrapf(err, "failed to delete project group")

2
cmd/agola/cmd/projectgroupupdate.go
View File

@ -79,7 +79,7 @@ func projectGroupUpdate(cmd *cobra.Command, args []string) error {
req.Name = &projectGroupUpdateOpts.visibility
}
log.Info().Msgf("updating project group")
log.Info().Msg("updating project group")
projectGroup, _, err := gwClient.UpdateProjectGroup(context.TODO(), projectGroupUpdateOpts.ref, req)
if err != nil {
return errors.Wrapf(err, "failed to update project group")

4
cmd/agola/cmd/projectreconfig.go
View File

@ -55,11 +55,11 @@ func init() {
func projectReconfig(cmd *cobra.Command, args []string) error {
gwClient := gwclient.NewClient(gatewayURL, token)
log.Info().Msgf("reconfiguring remote project")
log.Info().Msg("reconfiguring remote project")
if _, err := gwClient.ReconfigProject(context.TODO(), projectReconfigOpts.name); err != nil {
return errors.Wrapf(err, "failed to reconfigure remote project")
}
log.Info().Msgf("project reconfigured")
log.Info().Msg("project reconfigured")
return nil
}

4
cmd/agola/cmd/projectsecretcreate.go
View File

@ -103,14 +103,14 @@ func secretCreate(cmd *cobra.Command, ownertype string, args []string) error {
switch ownertype {
case "project":
log.Info().Msgf("creating project secret")
log.Info().Msg("creating project secret")
secret, _, err := gwClient.CreateProjectSecret(context.TODO(), secretCreateOpts.parentRef, req)
if err != nil {
return errors.Wrapf(err, "failed to create project secret")
}
log.Info().Msgf("project secret %q created, ID: %q", secret.Name, secret.ID)
case "projectgroup":
log.Info().Msgf("creating project group secret")
log.Info().Msg("creating project group secret")
secret, _, err := gwClient.CreateProjectGroupSecret(context.TODO(), secretCreateOpts.parentRef, req)
if err != nil {
return errors.Wrapf(err, "failed to create project group secret")

8
cmd/agola/cmd/projectsecretdelete.go
View File

@ -62,19 +62,19 @@ func secretDelete(cmd *cobra.Command, ownertype string, args []string) error {
switch ownertype {
case "project":
log.Info().Msgf("deleting project secret")
log.Info().Msg("deleting project secret")
_, err := gwClient.DeleteProjectSecret(context.TODO(), secretDeleteOpts.parentRef, secretDeleteOpts.name)
if err != nil {
return errors.Wrapf(err, "failed to delete project secret")
}
log.Info().Msgf("project secret deleted")
log.Info().Msg("project secret deleted")
case "projectgroup":
log.Info().Msgf("deleting project group secret")
log.Info().Msg("deleting project group secret")
_, err := gwClient.DeleteProjectGroupSecret(context.TODO(), secretDeleteOpts.parentRef, secretDeleteOpts.name)
if err != nil {
return errors.Wrapf(err, "failed to delete project group secret")
}
log.Info().Msgf("project group secret deleted")
log.Info().Msg("project group secret deleted")
}
return nil

4
cmd/agola/cmd/projectsecretupdate.go
View File

@ -110,14 +110,14 @@ func secretUpdate(cmd *cobra.Command, ownertype string, args []string) error {
switch ownertype {
case "project":
log.Info().Msgf("creating project secret")
log.Info().Msg("creating project secret")
secret, _, err := gwClient.UpdateProjectSecret(context.TODO(), secretUpdateOpts.parentRef, secretUpdateOpts.name, req)
if err != nil {
return errors.Wrapf(err, "failed to update project secret")
}
log.Info().Msgf("project secret %q updated, ID: %q", secret.Name, secret.ID)
case "projectgroup":
log.Info().Msgf("creating project group secret")
log.Info().Msg("creating project group secret")
secret, _, err := gwClient.UpdateProjectGroupSecret(context.TODO(), secretUpdateOpts.parentRef, secretUpdateOpts.name, req)
if err != nil {
return errors.Wrapf(err, "failed to update project group secret")

2
cmd/agola/cmd/projectupdate.go
View File

@ -85,7 +85,7 @@ func projectUpdate(cmd *cobra.Command, args []string) error {
req.PassVarsToForkedPR = &projectUpdateOpts.passVarsToForkedPR
}
log.Info().Msgf("updating project")
log.Info().Msg("updating project")
project, _, err := gwClient.UpdateProject(context.TODO(), projectUpdateOpts.ref, req)
if err != nil {
return errors.Wrapf(err, "failed to update project")

4
cmd/agola/cmd/projectvariablecreate.go
View File

@ -133,14 +133,14 @@ func variableCreate(cmd *cobra.Command, ownertype string, args []string) error {
switch ownertype {
case "project":
log.Info().Msgf("creating project variable")
log.Info().Msg("creating project variable")
variable, _, err := gwClient.CreateProjectVariable(context.TODO(), variableCreateOpts.parentRef, req)
if err != nil {
return errors.Wrapf(err, "failed to create project variable")
}
log.Info().Msgf("project variable %q created, ID: %q", variable.Name, variable.ID)
case "projectgroup":
log.Info().Msgf("creating project group variable")
log.Info().Msg("creating project group variable")
variable, _, err := gwClient.CreateProjectGroupVariable(context.TODO(), variableCreateOpts.parentRef, req)
if err != nil {
return errors.Wrapf(err, "failed to create project group variable")

8
cmd/agola/cmd/projectvariabledelete.go
View File

@ -62,19 +62,19 @@ func variableDelete(cmd *cobra.Command, ownertype string, args []string) error {
switch ownertype {
case "project":
log.Info().Msgf("deleting project variable")
log.Info().Msg("deleting project variable")
_, err := gwClient.DeleteProjectVariable(context.TODO(), variableDeleteOpts.parentRef, variableDeleteOpts.name)
if err != nil {
return errors.Wrapf(err, "failed to delete project variable")
}
log.Info().Msgf("project variable deleted")
log.Info().Msg("project variable deleted")
case "projectgroup":
log.Info().Msgf("deleting project group variable")
log.Info().Msg("deleting project group variable")
_, err := gwClient.DeleteProjectGroupVariable(context.TODO(), variableDeleteOpts.parentRef, variableDeleteOpts.name)
if err != nil {
return errors.Wrapf(err, "failed to delete project group variable")
}
log.Info().Msgf("project group variable deleted")
log.Info().Msg("project group variable deleted")
}
return nil

4
cmd/agola/cmd/projectvariableupdate.go
View File

@ -110,14 +110,14 @@ func variableUpdate(cmd *cobra.Command, ownertype string, args []string) error {
switch ownertype {
case "project":
log.Info().Msgf("updating project variable")
log.Info().Msg("updating project variable")
variable, _, err := gwClient.UpdateProjectVariable(context.TODO(), variableUpdateOpts.parentRef, variableUpdateOpts.name, req)
if err != nil {
return errors.Wrapf(err, "failed to update project variable")
}
log.Info().Msgf("project variable %q updated, ID: %q", variable.Name, variable.ID)
case "projectgroup":
log.Info().Msgf("updating project group variable")
log.Info().Msg("updating project group variable")
variable, _, err := gwClient.UpdateProjectGroupVariable(context.TODO(), variableUpdateOpts.parentRef, variableUpdateOpts.name, req)
if err != nil {
return errors.Wrapf(err, "failed to update project group variable")

2
cmd/agola/cmd/remotesourcecreate.go
View File

@ -114,7 +114,7 @@ func remoteSourceCreate(cmd *cobra.Command, args []string) error {
LoginEnabled: util.Ptr(remoteSourceCreateOpts.loginEnabled),
}
log.Info().Msgf("creating remotesource")
log.Info().Msg("creating remotesource")
remoteSource, _, err := gwClient.CreateRemoteSource(context.TODO(), req)
if err != nil {
return errors.Wrapf(err, "failed to create remotesource")

2
cmd/agola/cmd/remotesourceupdate.go
View File

@ -106,7 +106,7 @@ func remoteSourceUpdate(cmd *cobra.Command, args []string) error {
req.LoginEnabled = &remoteSourceUpdateOpts.loginEnabled
}
log.Info().Msgf("updating remotesource")
log.Info().Msg("updating remotesource")
remoteSource, _, err := gwClient.UpdateRemoteSource(context.TODO(), remoteSourceUpdateOpts.ref, req)
if err != nil {
return errors.Wrapf(err, "failed to update remotesource")

2
cmd/agola/cmd/usercreate.go
View File

@ -60,7 +60,7 @@ func userCreate(cmd *cobra.Command, args []string) error {
UserName: userCreateOpts.username,
}
log.Info().Msgf("creating user")
log.Info().Msg("creating user")
user, _, err := gwClient.CreateUser(context.TODO(), req)
if err != nil {
return errors.Wrapf(err, "failed to create user")

8
internal/git-handler/handler.go
View File

@ -208,7 +208,7 @@ func (h *GitSmartHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
res, err := InfoRefsResponse(ctx, repoAbsPath, serviceName)
if err != nil {
// we cannot return any http error since the http header has already been written
h.log.Err(err).Msgf("git command error")
h.log.Err(err).Msg("git command error")
return
}
@ -220,14 +220,14 @@ func (h *GitSmartHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if err := gitService(ctx, w, body, repoAbsPath, "upload-pack"); err != nil {
// we cannot return any http error since the http header has already been written
h.log.Err(err).Msgf("git command error")
h.log.Err(err).Msg("git command error")
}
case RequestTypeReceivePack:
w.Header().Set("Content-Type", "application/x-git-receive-pack-result")
if err := gitService(ctx, w, body, repoAbsPath, "receive-pack"); err != nil {
// we cannot return any http error since the http header has already been written
h.log.Err(err).Msgf("git command error")
h.log.Err(err).Msg("git command error")
}
}
}
@ -266,7 +266,7 @@ func (h *FetchFileHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
if err := gitFetchFile(ctx, w, r.Body, repoAbsPath, fetchData.Ref, fetchData.Path); err != nil {
h.log.Err(err).Msgf("git command error")
h.log.Err(err).Msg("git command error")
// since we already answered with a 200 we cannot return another error code
// So abort the connection and the client will detect the missing ending chunk

12
internal/git-save/save.go
View File

@ -212,40 +212,40 @@ func (s *GitSave) Save(message, branchName string) (string, error) {
s.log.Info().Msgf("index %s does not exist", indexPath)
}
s.log.Info().Msgf("updating files already in the index")
s.log.Info().Msg("updating files already in the index")
if err := gitUpdateFiles(tmpIndexPath); err != nil {
return "", errors.WithStack(err)
}
if s.conf.AddUntracked {
s.log.Info().Msgf("adding untracked files")
s.log.Info().Msg("adding untracked files")
if err := gitAddUntrackedFiles(tmpIndexPath); err != nil {
return "", errors.WithStack(err)
}
}
if s.conf.AddIgnored {
s.log.Info().Msgf("adding ignored files")
s.log.Info().Msg("adding ignored files")
if err := gitAddIgnoredFiles(tmpIndexPath); err != nil {
return "", errors.WithStack(err)
}
}
s.log.Info().Msgf("writing tree file")
s.log.Info().Msg("writing tree file")
treeSHA, err := gitWriteTree(tmpIndexPath)
if err != nil {
return "", errors.WithStack(err)
}
s.log.Info().Msgf("tree: %s", treeSHA)
s.log.Info().Msgf("committing tree")
s.log.Info().Msg("committing tree")
commitSHA, err := gitCommitTree(message, treeSHA)
if err != nil {
return "", errors.WithStack(err)
}
s.log.Info().Msgf("commit: %s", commitSHA)
s.log.Info().Msgf("updating ref")
s.log.Info().Msg("updating ref")
if err = gitUpdateRef("git-save", filepath.Join(s.refsPrefix, branchName), commitSHA); err != nil {
return "", errors.WithStack(err)
}

12
internal/services/configstore/configstore.go
View File

@ -46,11 +46,11 @@ func (s *Configstore) maintenanceModeWatcherLoop(ctx context.Context, runCtxCanc
s.log.Info().Msgf("maintenance mode watcher: maintenance mode enabled: %t", maintenanceMode)
for {
s.log.Debug().Msgf("maintenanceModeWatcherLoop")
s.log.Debug().Msg("maintenanceModeWatcherLoop")
// at first watch restart from previous processed revision
if err := s.maintenanceModeWatcher(ctx, runCtxCancel, maintenanceMode); err != nil {
s.log.Err(err).Msgf("maintenance mode watcher error")
s.log.Err(err).Msg("maintenance mode watcher error")
}
sleepCh := time.NewTimer(1 * time.Second).C
@ -331,13 +331,13 @@ func (s *Configstore) setupMaintenanceRouter() http.Handler {
func (s *Configstore) Run(ctx context.Context) error {
for {
if err := s.run(ctx); err != nil {
log.Err(err).Msgf("run error")
log.Err(err).Msg("run error")
}
sleepCh := time.NewTimer(1 * time.Second).C
select {
case <-ctx.Done():
s.log.Info().Msgf("configstore exiting")
s.log.Info().Msg("configstore exiting")
return nil
case <-sleepCh:
}
@ -399,10 +399,10 @@ func (s *Configstore) run(ctx context.Context) error {
select {
case <-ctx.Done():
log.Info().Msgf("configstore run exiting")
log.Info().Msg("configstore run exiting")
case err = <-lerrCh:
if err != nil {
log.Err(err).Msgf("http server listen error")
log.Err(err).Msg("http server listen error")
}
case err = <-errCh:
if err != nil {

6
internal/services/executor/driver/k8s.go
View File

@ -144,7 +144,7 @@ func NewK8sDriver(log zerolog.Logger, executorID, toolboxPath, initImage string,
sv, err := parseGitVersion(serverVersion.GitVersion)
// if server version parsing fails just warn but ignore it
if err != nil {
d.log.Warn().Err(err).Msgf("failed to parse k8s server version")
d.log.Warn().Err(err).Msg("failed to parse k8s server version")
}
if sv != nil {
// for k8s version < v1.14.x use old arch label
@ -205,7 +205,7 @@ func NewK8sDriver(log zerolog.Logger, executorID, toolboxPath, initImage string,
go func() {
for {
if err := d.updateLease(ctx); err != nil {
d.log.Err(err).Msgf("failed to update executor lease")
d.log.Err(err).Msg("failed to update executor lease")
}
select {
@ -221,7 +221,7 @@ func NewK8sDriver(log zerolog.Logger, executorID, toolboxPath, initImage string,
go func() {
for {
if err := d.cleanStaleExecutorsLease(ctx); err != nil {
d.log.Err(err).Msgf("failed to clean stale executors lease")
d.log.Err(err).Msg("failed to clean stale executors lease")
}
select {

18
internal/services/executor/executor.go
View File

@ -862,7 +862,7 @@ func (e *Executor) setupTask(ctx context.Context, rt *runningTask) error {
return errors.Errorf("executor doesn't allow executing privileged containers")
}
e.log.Debug().Msgf("starting pod")
e.log.Debug().Msg("starting pod")
dockerRegistriesAuth := map[string]registry.DockerRegistryAuth{}
for n, v := range et.Spec.DockerRegistriesAuth {
@ -1030,7 +1030,7 @@ func (e *Executor) executeTaskSteps(ctx context.Context, rt *runningTask, pod dr
func (e *Executor) podsCleanerLoop(ctx context.Context) {
for {
e.log.Debug().Msgf("podsCleaner")
e.log.Debug().Msg("podsCleaner")
if err := e.podsCleaner(ctx); err != nil {
e.log.Err(err).Send()
@ -1086,7 +1086,7 @@ func (e *Executor) podsCleaner(ctx context.Context) error {
func (e *Executor) executorStatusSenderLoop(ctx context.Context) {
for {
e.log.Debug().Msgf("executorStatusSenderLoop")
e.log.Debug().Msg("executorStatusSenderLoop")
if err := e.sendExecutorStatus(ctx); err != nil {
e.log.Err(err).Send()
@ -1103,7 +1103,7 @@ func (e *Executor) executorStatusSenderLoop(ctx context.Context) {
func (e *Executor) executorTasksStatusSenderLoop(ctx context.Context) {
for {
e.log.Debug().Msgf("executorTasksStatusSenderLoop")
e.log.Debug().Msg("executorTasksStatusSenderLoop")
for _, rtID := range e.runningTasks.ids() {
rt, ok := e.runningTasks.get(rtID)
@ -1139,7 +1139,7 @@ func (e *Executor) executorTasksStatusSenderLoop(ctx context.Context) {
func (e *Executor) tasksUpdaterLoop(ctx context.Context) {
for {
e.log.Debug().Msgf("tasksUpdater")
e.log.Debug().Msg("tasksUpdater")
if err := e.tasksUpdater(ctx); err != nil {
e.log.Err(err).Send()
@ -1267,7 +1267,7 @@ func (e *Executor) taskUpdater(ctx context.Context, et *rsapitypes.ExecutorTask)
func (e *Executor) tasksDataCleanerLoop(ctx context.Context) {
for {
e.log.Debug().Msgf("tasksDataCleaner")
e.log.Debug().Msg("tasksDataCleaner")
if err := e.tasksDataCleaner(ctx); err != nil {
e.log.Err(err).Send()
@ -1563,11 +1563,11 @@ func (e *Executor) Run(ctx context.Context) error {
select {
case <-ctx.Done():
log.Info().Msgf("runservice executor exiting")
log.Info().Msg("runservice executor exiting")
httpServer.Close()
case err := <-lerrCh:
if err != nil {
log.Err(err).Msgf("http server listen error")
log.Err(err).Msg("http server listen error")
return errors.WithStack(err)
}
}
@ -1577,7 +1577,7 @@ func (e *Executor) Run(ctx context.Context) error {
func (e *Executor) tasksTimeoutCleanerLoop(ctx context.Context) {
for {
e.log.Debug().Msgf("tasksTimeoutCleaner")
e.log.Debug().Msg("tasksTimeoutCleaner")
e.tasksTimeoutCleaner()

6
internal/services/gateway/action/org.go
View File

@ -208,7 +208,7 @@ func (h *ActionHandler) CreateOrg(ctx context.Context, req *CreateOrgRequest) (*
CreatorUserID: curUserID,
}
h.log.Info().Msgf("creating organization")
h.log.Info().Msg("creating organization")
org, _, err := h.configstoreClient.CreateOrg(ctx, creq)
if err != nil {
return nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsg("failed to create organization"))
@ -244,7 +244,7 @@ func (h *ActionHandler) UpdateOrg(ctx context.Context, orgRef string, req *Updat
Visibility: org.Visibility,
}
h.log.Info().Msgf("updating organization")
h.log.Info().Msg("updating organization")
org, _, err = h.configstoreClient.UpdateOrg(ctx, orgRef, creq)
if err != nil {
return nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsg("failed to update organization"))
@ -425,7 +425,7 @@ func (h *ActionHandler) CreateOrgInvitation(ctx context.Context, req *CreateOrgI
Role: req.Role,
}
h.log.Info().Msgf("creating org invitation")
h.log.Info().Msg("creating org invitation")
orgInvitation, _, err := h.configstoreClient.CreateOrgInvitation(ctx, org.ID, creq)
if err != nil {
return nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsg("failed to create org invitation"))

24
internal/services/gateway/action/project.go
View File

@ -125,7 +125,7 @@ func (h *ActionHandler) CreateProject(ctx context.Context, req *CreateProjectReq
return nil, errors.Wrapf(err, "failed to get repository info from gitsource")
}
h.log.Info().Msgf("generating ssh key pairs")
h.log.Info().Msg("generating ssh key pairs")
privateKey, _, err := util.GenSSHKeyPair(4096)
if err != nil {
return nil, errors.Wrapf(err, "failed to generate ssh key pair")
@ -150,7 +150,7 @@ func (h *ActionHandler) CreateProject(ctx context.Context, req *CreateProjectReq
MembersCanPerformRunActions: req.MembersCanPerformRunActions,
}
h.log.Info().Msgf("creating project")
h.log.Info().Msg("creating project")
rp, _, err := h.configstoreClient.CreateProject(ctx, creq)
if err != nil {
return nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsg("failed to create project"))
@ -159,16 +159,16 @@ func (h *ActionHandler) CreateProject(ctx context.Context, req *CreateProjectReq
if serr := h.setupGitSourceRepo(ctx, rs, user, la, rp); serr != nil {
var err error
h.log.Err(err).Msgf("failed to setup git source repo, trying to cleanup")
h.log.Err(err).Msg("failed to setup git source repo, trying to cleanup")
// try to cleanup gitsource configs and remove project
// we'll log but ignore errors
h.log.Info().Msgf("deleting project with ID: %q", rp.ID)
if _, err := h.configstoreClient.DeleteProject(ctx, rp.ID); err != nil {
h.log.Err(err).Msgf("failed to delete project ")
h.log.Err(err).Msg("failed to delete project ")
}
h.log.Info().Msgf("cleanup git source repo")
h.log.Info().Msg("cleanup git source repo")
if err := h.cleanupGitSourceRepo(ctx, rs, user, la, rp); err != nil {
h.log.Err(err).Msgf("failed to cleanup git source repo")
h.log.Err(err).Msg("failed to cleanup git source repo")
}
return nil, errors.Wrapf(serr, "failed to setup git source repo")
}
@ -231,7 +231,7 @@ func (h *ActionHandler) UpdateProject(ctx context.Context, projectRef string, re
MembersCanPerformRunActions: p.MembersCanPerformRunActions,
}
h.log.Info().Msgf("updating project")
h.log.Info().Msg("updating project")
rp, _, err := h.configstoreClient.UpdateProject(ctx, p.ID, creq)
if err != nil {
return nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsg("failed to update project"))
@ -288,7 +288,7 @@ func (h *ActionHandler) ProjectUpdateRepoLinkedAccount(ctx context.Context, proj
DefaultBranch: p.DefaultBranch,
}
h.log.Info().Msgf("updating project")
h.log.Info().Msg("updating project")
rp, _, err := h.configstoreClient.UpdateProject(ctx, p.ID, creq)
if err != nil {
return nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsg("failed to update project"))
@ -322,7 +322,7 @@ func (h *ActionHandler) setupGitSourceRepo(ctx context.Context, rs *cstypes.Remo
if err := gitsource.UpdateDeployKey(project.RepositoryPath, deployKeyName, string(pubKey), true); err != nil {
return errors.Wrapf(err, "failed to create deploy key")
}
h.log.Info().Msgf("deleting existing webhooks")
h.log.Info().Msg("deleting existing webhooks")
if err := gitsource.DeleteRepoWebhook(project.RepositoryPath, webhookURL); err != nil {
return errors.Wrapf(err, "failed to delete repository webhook")
}
@ -353,7 +353,7 @@ func (h *ActionHandler) cleanupGitSourceRepo(ctx context.Context, rs *cstypes.Re
if err := gitsource.DeleteDeployKey(project.RepositoryPath, deployKeyName); err != nil {
return errors.Wrapf(err, "failed to create deploy key")
}
h.log.Info().Msgf("deleting existing webhooks")
h.log.Info().Msg("deleting existing webhooks")
if err := gitsource.DeleteRepoWebhook(project.RepositoryPath, webhookURL); err != nil {
return errors.Wrapf(err, "failed to delete repository webhook")
}
@ -430,7 +430,7 @@ func (h *ActionHandler) DeleteProject(ctx context.Context, projectRef string) er
// try to cleanup gitsource configs
// we'll log but ignore errors
if canDoRepCleanup {
h.log.Info().Msgf("cleanup git source repo")
h.log.Info().Msg("cleanup git source repo")
if err := h.cleanupGitSourceRepo(ctx, rs, user, la, p); err != nil {
h.log.Err(err).Msgf("failed to cleanup git source repo: %+v", err)
}
@ -655,7 +655,7 @@ func (h *ActionHandler) RefreshRemoteRepositoryInfo(ctx context.Context, project
DefaultBranch: repoInfo.DefaultBranch,
}
h.log.Info().Msgf("updating project")
h.log.Info().Msg("updating project")
rp, _, err := h.configstoreClient.UpdateProject(ctx, p.ID, creq)
if err != nil {
return nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsg("failed to update project"))

4
internal/services/gateway/action/projectgroup.go
View File

@ -116,7 +116,7 @@ func (h *ActionHandler) CreateProjectGroup(ctx context.Context, req *CreateProje
Visibility: req.Visibility,
}
h.log.Info().Msgf("creating projectGroup")
h.log.Info().Msg("creating projectGroup")
rp, _, err := h.configstoreClient.CreateProjectGroup(ctx, creq)
if err != nil {
return nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsg("failed to create project group"))
@ -163,7 +163,7 @@ func (h *ActionHandler) UpdateProjectGroup(ctx context.Context, projectGroupRef
Visibility: pg.Visibility,
}
h.log.Info().Msgf("updating project group")
h.log.Info().Msg("updating project group")
rp, _, err := h.configstoreClient.UpdateProjectGroup(ctx, pg.ID, creq)
if err != nil {
return nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsg("failed to create project group"))

4
internal/services/gateway/action/remotesource.go
View File

@ -159,7 +159,7 @@ func (h *ActionHandler) CreateRemoteSource(ctx context.Context, req *CreateRemot
LoginEnabled: loginEnabled,
}
h.log.Info().Msgf("creating remotesource")
h.log.Info().Msg("creating remotesource")
rs, _, err := h.configstoreClient.CreateRemoteSource(ctx, creq)
if err != nil {
return nil, errors.Wrapf(err, "failed to create remotesource")
@ -257,7 +257,7 @@ func (h *ActionHandler) UpdateRemoteSource(ctx context.Context, req *UpdateRemot
LoginEnabled: rs.LoginEnabled,
}
h.log.Info().Msgf("updating remotesource")
h.log.Info().Msg("updating remotesource")
rs, _, err = h.configstoreClient.UpdateRemoteSource(ctx, req.RemoteSourceRef, creq)
if err != nil {
return nil, errors.Wrapf(err, "failed to update remotesource")

12
internal/services/gateway/action/run.go
View File

@ -590,7 +590,7 @@ func (h *ActionHandler) CreateRuns(ctx context.Context, req *CreateRunRequest) e
config, err := config.ParseConfig([]byte(data), configFormat, configContext)
if err != nil {
h.log.Err(err).Msgf("failed to parse config")
h.log.Err(err).Msg("failed to parse config")
// create a run (per config file) with a generic error since we cannot parse
// it and know how many runs are defined
@ -605,7 +605,7 @@ func (h *ActionHandler) CreateRuns(ctx context.Context, req *CreateRunRequest) e
}
if _, _, err := h.runserviceClient.CreateRun(ctx, createRunReq); err != nil {
h.log.Err(err).Msgf("failed to create run")
h.log.Err(err).Msg("failed to create run")
return APIErrorFromRemoteError(err)
}
return nil
@ -613,12 +613,12 @@ func (h *ActionHandler) CreateRuns(ctx context.Context, req *CreateRunRequest) e
for _, run := range config.Runs {
if SkipRunMessage.MatchString(req.Message) {
h.log.Debug().Msgf("skipping run since special commit message")
h.log.Debug().Msg("skipping run since special commit message")
continue
}
if match := types.MatchWhen(run.When.ToWhen(), req.RefType, req.Branch, req.Tag, req.Ref); !match {
h.log.Debug().Msgf("skipping run since when condition doesn't match")
h.log.Debug().Msg("skipping run since when condition doesn't match")
continue
}
@ -635,7 +635,7 @@ func (h *ActionHandler) CreateRuns(ctx context.Context, req *CreateRunRequest) e
}
if _, _, err := h.runserviceClient.CreateRun(ctx, createRunReq); err != nil {
h.log.Err(err).Msgf("failed to create run")
h.log.Err(err).Msg("failed to create run")
return APIErrorFromRemoteError(err)
}
}
@ -653,7 +653,7 @@ func (h *ActionHandler) fetchConfigFiles(ctx context.Context, gitSource gitsourc
if err == nil {
return true, nil
}
h.log.Err(err).Msgf("get file err")
h.log.Err(err).Msg("get file err")
}
return false, nil
})

12
internal/services/gateway/action/secret.go
View File

@ -93,10 +93,10 @@ func (h *ActionHandler) CreateSecret(ctx context.Context, req *CreateSecretReque
var rs *csapitypes.Secret
switch req.ParentType {
case cstypes.ObjectKindProjectGroup:
h.log.Info().Msgf("creating project group secret")
h.log.Info().Msg("creating project group secret")
rs, _, err = h.configstoreClient.CreateProjectGroupSecret(ctx, req.ParentRef, creq)
case cstypes.ObjectKindProject:
h.log.Info().Msgf("creating project secret")
h.log.Info().Msg("creating project secret")
rs, _, err = h.configstoreClient.CreateProjectSecret(ctx, req.ParentRef, creq)
}
if err != nil {
@ -147,10 +147,10 @@ func (h *ActionHandler) UpdateSecret(ctx context.Context, req *UpdateSecretReque
var rs *csapitypes.Secret
switch req.ParentType {
case cstypes.ObjectKindProjectGroup:
h.log.Info().Msgf("updating project group secret")
h.log.Info().Msg("updating project group secret")
rs, _, err = h.configstoreClient.UpdateProjectGroupSecret(ctx, req.ParentRef, req.SecretName, creq)
case cstypes.ObjectKindProject:
h.log.Info().Msgf("updating project secret")
h.log.Info().Msg("updating project secret")
rs, _, err = h.configstoreClient.UpdateProjectSecret(ctx, req.ParentRef, req.SecretName, creq)
}
if err != nil {
@ -172,10 +172,10 @@ func (h *ActionHandler) DeleteSecret(ctx context.Context, parentType cstypes.Obj
switch parentType {
case cstypes.ObjectKindProjectGroup:
h.log.Info().Msgf("deleting project group secret")
h.log.Info().Msg("deleting project group secret")
_, err = h.configstoreClient.DeleteProjectGroupSecret(ctx, parentRef, name)
case cstypes.ObjectKindProject:
h.log.Info().Msgf("deleting project secret")
h.log.Info().Msg("deleting project secret")
_, err = h.configstoreClient.DeleteProjectSecret(ctx, parentRef, name)
}
if err != nil {

8
internal/services/gateway/action/user.go
View File

@ -240,7 +240,7 @@ func (h *ActionHandler) CreateUser(ctx context.Context, req *CreateUserRequest)
UserName: req.UserName,
}
h.log.Info().Msgf("creating user")
h.log.Info().Msg("creating user")
u, _, err := h.configstoreClient.CreateUser(ctx, creq)
if err != nil {
return nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsg("failed to create user"))
@ -290,7 +290,7 @@ func (h *ActionHandler) CreateUserToken(ctx context.Context, req *CreateUserToke
return "", util.NewAPIError(util.ErrBadRequest, util.WithAPIErrorMsgf("user %q already have a token with name %q", userRef, req.TokenName), serrors.UserTokenAlreadyExists())
}
h.log.Info().Msgf("creating user token")
h.log.Info().Msg("creating user token")
creq := &csapitypes.CreateUserTokenRequest{
TokenName: req.TokenName,
}
@ -375,7 +375,7 @@ func (h *ActionHandler) CreateUserLA(ctx context.Context, req *CreateUserLAReque
Oauth2AccessTokenExpiresAt: req.Oauth2AccessTokenExpiresAt,
}
h.log.Info().Msgf("creating linked account")
h.log.Info().Msg("creating linked account")
la, _, err = h.configstoreClient.CreateUserLA(ctx, userRef, creq)
if err != nil {
return nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsg("failed to create linked account"))
@ -538,7 +538,7 @@ func (h *ActionHandler) RegisterUser(ctx context.Context, req *RegisterUserReque
},
}
h.log.Info().Msgf("creating user account")
h.log.Info().Msg("creating user account")
u, _, err := h.configstoreClient.CreateUser(ctx, creq)
if err != nil {
return nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsg("failed to create linked account"))

12
internal/services/gateway/action/variable.go
View File

@ -111,7 +111,7 @@ func (h *ActionHandler) CreateVariable(ctx context.Context, req *CreateVariableR
return nil, nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsgf("failed to get project group %q secrets", req.ParentRef))
}
h.log.Info().Msgf("creating project group variable")
h.log.Info().Msg("creating project group variable")
rv, _, err = h.configstoreClient.CreateProjectGroupVariable(ctx, req.ParentRef, creq)
if err != nil {
return nil, nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsg("failed to create variable"))
@ -123,7 +123,7 @@ func (h *ActionHandler) CreateVariable(ctx context.Context, req *CreateVariableR
return nil, nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsgf("failed to get project %q secrets", req.ParentRef))
}
h.log.Info().Msgf("creating project variable")
h.log.Info().Msg("creating project variable")
rv, _, err = h.configstoreClient.CreateProjectVariable(ctx, req.ParentRef, creq)
if err != nil {
return nil, nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsg("failed to create variable"))
@ -178,7 +178,7 @@ func (h *ActionHandler) UpdateVariable(ctx context.Context, req *UpdateVariableR
return nil, nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsgf("failed to get project group %q secrets", req.ParentRef))
}
h.log.Info().Msgf("creating project group variable")
h.log.Info().Msg("creating project group variable")
rv, _, err = h.configstoreClient.UpdateProjectGroupVariable(ctx, req.ParentRef, req.VariableName, creq)
if err != nil {
return nil, nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsg("failed to create variable"))
@ -190,7 +190,7 @@ func (h *ActionHandler) UpdateVariable(ctx context.Context, req *UpdateVariableR
return nil, nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsgf("failed to get project %q secrets", req.ParentRef))
}
h.log.Info().Msgf("creating project variable")
h.log.Info().Msg("creating project variable")
rv, _, err = h.configstoreClient.UpdateProjectVariable(ctx, req.ParentRef, req.VariableName, creq)
if err != nil {
return nil, nil, APIErrorFromRemoteError(err, util.WithAPIErrorMsg("failed to create variable"))
@ -212,10 +212,10 @@ func (h *ActionHandler) DeleteVariable(ctx context.Context, parentType cstypes.O
switch parentType {
case cstypes.ObjectKindProjectGroup:
h.log.Info().Msgf("deleting project group variable")
h.log.Info().Msg("deleting project group variable")
_, err = h.configstoreClient.DeleteProjectGroupVariable(ctx, parentRef, name)
case cstypes.ObjectKindProject:
h.log.Info().Msgf("deleting project variable")
h.log.Info().Msg("deleting project variable")
_, err = h.configstoreClient.DeleteProjectVariable(ctx, parentRef, name)
}
if err != nil {

4
internal/services/gateway/api/user.go
View File

@ -324,7 +324,7 @@ func (h *CreateUserLAHandler) createUserLA(ctx context.Context, userRef string,
RemoteSourceName: req.RemoteSourceName,
}
h.log.Info().Msgf("creating linked account")
h.log.Info().Msg("creating linked account")
cresp, err := h.ah.HandleRemoteSourceAuth(ctx, req.RemoteSourceName, req.RemoteSourceLoginName, req.RemoteSourceLoginPassword, action.RemoteSourceRequestTypeCreateUserLA, creq)
if err != nil {
return nil, errors.WithStack(err)
@ -629,7 +629,7 @@ func (h *LoginUserHandler) do(w http.ResponseWriter, r *http.Request) (*gwapityp
RemoteSourceName: req.RemoteSourceName,
}
h.log.Info().Msgf("logging in user")
h.log.Info().Msg("logging in user")
cresp, err := h.ah.HandleRemoteSourceAuth(ctx, req.RemoteSourceName, req.LoginName, req.LoginPassword, action.RemoteSourceRequestTypeLoginUser, creq)
if err != nil {
return nil, errors.WithStack(err)

2
internal/services/gateway/api/webhook.go
View File

@ -116,7 +116,7 @@ func (h *webhooksHandler) do(r *http.Request) error {
// skip nil webhook data
// TODO(sgotti) report the reason of the skip
if webhookData == nil {
h.log.Info().Msgf("skipping webhook")
h.log.Info().Msg("skipping webhook")
return nil
}

4
internal/services/gateway/gateway.go
View File

@ -442,11 +442,11 @@ func (g *Gateway) Run(ctx context.Context) error {
select {
case <-ctx.Done():
log.Info().Msgf("configstore exiting")
log.Info().Msg("configstore exiting")
httpServer.Close()
case err := <-lerrCh:
if err != nil {
log.Err(err).Msgf("http server listen error")
log.Err(err).Msg("http server listen error")
return errors.WithStack(err)
}
}

4
internal/services/gitserver/main.go
View File

@ -187,11 +187,11 @@ func (s *Gitserver) Run(ctx context.Context) error {
select {
case <-ctx.Done():
log.Info().Msgf("gitserver exiting")
log.Info().Msg("gitserver exiting")
httpServer.Close()
case err := <-lerrCh:
if err != nil {
s.log.Err(err).Msgf("http server listen error")
s.log.Err(err).Msg("http server listen error")
return errors.WithStack(err)
}
}

10
internal/services/gitserver/repo-cleaner.go
View File

@ -15,19 +15,19 @@ func (s *Gitserver) repoCleanerLoop(ctx context.Context) {
for {
select {
case <-ctx.Done():
s.log.Info().Msgf("repoCleaner exiting")
s.log.Info().Msg("repoCleaner exiting")
return
case <-time.After(s.c.RepositoryCleanupInterval):
if err := s.scanRepos(ctx); err != nil {
s.log.Err(err).Msgf("scanRepos error")
s.log.Err(err).Msg("scanRepos error")
}
}
}
}
func (s *Gitserver) scanRepos(ctx context.Context) error {
s.log.Info().Msgf("repoCleaner scanRepos start")
s.log.Info().Msg("repoCleaner scanRepos start")
usersDir, err := os.ReadDir(s.c.DataDir)
if err != nil {
@ -46,12 +46,12 @@ func (s *Gitserver) scanRepos(ctx context.Context) error {
}
if err := s.scanRepo(ctx, filepath.Join(s.c.DataDir, u.Name(), r.Name())); err != nil {
s.log.Err(err).Msgf("scanRepo error")
s.log.Err(err).Msg("scanRepo error")
}
}
}
s.log.Info().Msgf("repoCleaner scanRepos end")
s.log.Info().Msg("repoCleaner scanRepos end")
return nil
}

4
internal/services/notification/commitstatus.go
View File

@ -135,11 +135,11 @@ func statusDescription(state types.CommitState) string {
}
func (n *NotificationService) commitStatusesCleanerLoop(ctx context.Context, commitStatusExpireInterval time.Duration) {
n.log.Debug().Msgf("commitStatusesCleanerLoop")
n.log.Debug().Msg("commitStatusesCleanerLoop")
for {
if err := n.commitStatusesCleaner(ctx, commitStatusExpireInterval); err != nil {
n.log.Warn().Err(err).Msgf("commitStatusesCleaner error")
n.log.Warn().Err(err).Msg("commitStatusesCleaner error")
}
sleepCh := time.NewTimer(commitStatusesCleanerInterval).C

2
internal/services/notification/commitstatusdelivery.go
View File

@ -84,7 +84,7 @@ func (n *NotificationService) commitStatusDeliveriesHandler(ctx context.Context)
for _, c := range commitStatusDeliveries {
if err := n.handleCommitStatusDelivery(ctx, c.ID); err != nil {
n.log.Err(err).Msgf("failed to trigger commit status data delivery event")
n.log.Err(err).Msg("failed to trigger commit status data delivery event")
}
curCommitStatusDeliverySequence = c.Sequence

8
internal/services/notification/notification.go
View File

@ -163,13 +163,13 @@ func (n *NotificationService) setupDefaultRouter() http.Handler {
func (n *NotificationService) Run(ctx context.Context) error {
for {
if err := n.run(ctx); err != nil {
n.log.Err(err).Msgf("run error")
n.log.Err(err).Msg("run error")
}
sleepCh := time.NewTimer(1 * time.Second).C
select {
case <-ctx.Done():
n.log.Info().Msgf("notification service exiting")
n.log.Info().Msg("notification service exiting")
return nil
case <-sleepCh:
}
@ -216,10 +216,10 @@ func (n *NotificationService) run(ctx context.Context) error {
select {
case <-ctx.Done():
n.log.Info().Msgf("notification service run exiting")
n.log.Info().Msg("notification service run exiting")
case err = <-lerrCh:
if err != nil {
n.log.Err(err).Msgf("http server listen error")
n.log.Err(err).Msg("http server listen error")
}
case err = <-errCh:
if err != nil {

4
internal/services/notification/runevents.go
View File

@ -124,13 +124,13 @@ func (n *NotificationService) runEventsHandler(ctx context.Context) error {
case rstypes.RunPhaseChanged:
commitStatus, err = n.generateCommitStatus(ctx, ev)
if err != nil {
n.log.Error().Msgf("failed to generate commit status")
n.log.Error().Msg("failed to generate commit status")
}
if n.c.WebhookURL != "" {
runWebhook := n.generatewebhook(ctx, ev)
webhookPayload, err = json.Marshal(runWebhook)
if err != nil {
n.log.Error().Msgf("failed to unmarshal run webhook")
n.log.Error().Msg("failed to unmarshal run webhook")
}
}
default:

2
internal/services/notification/runwebhookdelivery.go
View File

@ -84,7 +84,7 @@ func (n *NotificationService) runWebhookDeliveriesHandler(ctx context.Context) e
for _, r := range runWebhookDeliveries {
if err := n.handleRunWebhookDelivery(ctx, r.ID); err != nil {
n.log.Err(err).Msgf("failed to trigger run webhook delivery event")
n.log.Err(err).Msg("failed to trigger run webhook delivery event")
}
curRunWebhookDeliverySequence = r.Sequence

4
internal/services/notification/webhooks.go
View File

@ -129,11 +129,11 @@ func (n *NotificationService) generatewebhook(ctx context.Context, ev *rstypes.R
}
func (n *NotificationService) runWebhooksCleanerLoop(ctx context.Context, runWebhookExpireInterval time.Duration) {
n.log.Debug().Msgf("webhookCleanerLoop")
n.log.Debug().Msg("webhookCleanerLoop")
for {
if err := n.runWebhooksCleaner(ctx, runWebhookExpireInterval); err != nil {
n.log.Warn().Err(err).Msgf("webhooksCleaner error")
n.log.Warn().Err(err).Msg("webhooksCleaner error")
}
sleepCh := time.NewTimer(runWebhooksCleanerInterval).C

6
internal/services/runservice/action/action.go
View File

@ -361,14 +361,14 @@ func (h *ActionHandler) newRun(ctx context.Context, req *RunCreateRequest) (*typ
}
if err := runconfig.CheckRunConfigTasks(rcts); err != nil {
h.log.Err(err).Msgf("check run config tasks failed")
h.log.Err(err).Msg("check run config tasks failed")
setupErrors = append(setupErrors, err.Error())
}
// generate tasks levels
if len(setupErrors) == 0 {
if err := runconfig.GenTasksLevels(rcts); err != nil {
h.log.Err(err).Msgf("gen tasks leveles failed")
h.log.Err(err).Msg("gen tasks leveles failed")
setupErrors = append(setupErrors, err.Error())
}
}
@ -394,7 +394,7 @@ func (h *ActionHandler) newRun(ctx context.Context, req *RunCreateRequest) (*typ
func (h *ActionHandler) recreateRun(ctx context.Context, req *RunCreateRequest) (*types.RunBundle, error) {
// fetch the existing runconfig and run
h.log.Info().Msgf("creating run from existing run")
h.log.Info().Msg("creating run from existing run")
var rc *types.RunConfig
var run *types.Run

12
internal/services/runservice/runservice.go
View File

@ -45,11 +45,11 @@ func (s *Runservice) maintenanceModeWatcherLoop(ctx context.Context, runCtxCance
s.log.Info().Msgf("maintenance mode watcher: maintenance mode enabled: %t", maintenanceMode)
for {
s.log.Debug().Msgf("maintenanceModeWatcherLoop")
s.log.Debug().Msg("maintenanceModeWatcherLoop")
// at first watch restart from previous processed revision
if err := s.maintenanceModeWatcher(ctx, runCtxCancel, maintenanceMode); err != nil {
s.log.Err(err).Msgf("maintenance mode watcher error")
s.log.Err(err).Msg("maintenance mode watcher error")
}
sleepCh := time.NewTimer(1 * time.Second).C
@ -253,13 +253,13 @@ func (s *Runservice) setupMaintenanceRouter() http.Handler {
func (s *Runservice) Run(ctx context.Context) error {
for {
if err := s.run(ctx); err != nil {
s.log.Err(err).Msgf("run error")
s.log.Err(err).Msg("run error")
}
sleepCh := time.NewTimer(1 * time.Second).C
select {
case <-ctx.Done():
s.log.Info().Msgf("runservice exiting")
s.log.Info().Msg("runservice exiting")
return nil
case <-sleepCh:
}
@ -331,10 +331,10 @@ func (s *Runservice) run(ctx context.Context) error {
select {
case <-ctx.Done():
s.log.Info().Msgf("runservice run exiting")
s.log.Info().Msg("runservice run exiting")
case err = <-lerrCh:
if err != nil {
s.log.Err(err).Msgf("http server listen error")
s.log.Err(err).Msg("http server listen error")
}
case err = <-errCh:
if err != nil {

32
internal/services/runservice/scheduler.go
View File

@ -259,7 +259,7 @@ func (s *Runservice) submitRunTasks(ctx context.Context, r *types.Run, rc *types
return errors.WithStack(err)
}
if executor == nil {
s.log.Warn().Msgf("cannot choose an executor")
s.log.Warn().Msg("cannot choose an executor")
return nil
}
@ -846,7 +846,7 @@ func (s *Runservice) executorTaskUpdateHandler(ctx context.Context, c <-chan str
func (s *Runservice) executorTasksCleanerLoop(ctx context.Context) {
for {
s.log.Debug().Msgf("executorTasksCleaner")
s.log.Debug().Msg("executorTasksCleaner")
if err := s.executorTasksCleaner(ctx); err != nil {
s.log.Err(err).Send()
@ -967,7 +967,7 @@ func (s *Runservice) executorTaskCleaner(ctx context.Context, executorTaskID str
func (s *Runservice) runTasksUpdaterLoop(ctx context.Context) {
for {
s.log.Debug().Msgf("runTasksUpdater")
s.log.Debug().Msg("runTasksUpdater")
if err := s.runTasksUpdater(ctx); err != nil {
s.log.Err(err).Send()
@ -983,7 +983,7 @@ func (s *Runservice) runTasksUpdaterLoop(ctx context.Context) {
}
func (s *Runservice) runTasksUpdater(ctx context.Context) error {
s.log.Debug().Msgf("runTasksUpdater")
s.log.Debug().Msg("runTasksUpdater")
l := s.lf.NewLock(common.TaskUpdaterLockKey)
if err := l.Lock(ctx); err != nil {
@ -1212,7 +1212,7 @@ func (s *Runservice) finishArchivePhase(ctx context.Context, runID, runTaskID st
}
func (s *Runservice) fetchTaskLogs(ctx context.Context, runID string, rt *types.RunTask) {
s.log.Debug().Msgf("fetchTaskLogs")
s.log.Debug().Msg("fetchTaskLogs")
// fetch setup log
if rt.SetupStep.LogPhase == types.RunTaskFetchPhaseNotStarted {
@ -1323,7 +1323,7 @@ func (s *Runservice) fetchArchive(ctx context.Context, runID string, rt *types.R
}
func (s *Runservice) fetchTaskArchives(ctx context.Context, runID string, rt *types.RunTask) {
s.log.Debug().Msgf("fetchTaskArchives")
s.log.Debug().Msg("fetchTaskArchives")
for i, stepnum := range rt.WorkspaceArchives {
phase := rt.WorkspaceArchivesPhase[i]
@ -1342,7 +1342,7 @@ func (s *Runservice) fetchTaskArchives(ctx context.Context, runID string, rt *ty
func (s *Runservice) fetcherLoop(ctx context.Context) {
for {
s.log.Debug().Msgf("fetcher")
s.log.Debug().Msg("fetcher")
if err := s.fetcher(ctx); err != nil {
s.log.Err(err).Send()
@ -1358,7 +1358,7 @@ func (s *Runservice) fetcherLoop(ctx context.Context) {
}
func (s *Runservice) fetcher(ctx context.Context) error {
s.log.Debug().Msgf("fetcher")
s.log.Debug().Msg("fetcher")
var runs []*types.Run
err := s.d.Do(ctx, func(tx *sql.Tx) error {
@ -1447,7 +1447,7 @@ func (s *Runservice) taskFetcher(ctx context.Context, r *types.Run, rt *types.Ru
func (s *Runservice) runsSchedulerLoop(ctx context.Context) {
for {
s.log.Debug().Msgf("runsSchedulerLoop")
s.log.Debug().Msg("runsSchedulerLoop")
if err := s.runsScheduler(ctx); err != nil {
s.log.Err(err).Send()
@ -1463,7 +1463,7 @@ func (s *Runservice) runsSchedulerLoop(ctx context.Context) {
}
func (s *Runservice) runsScheduler(ctx context.Context) error {
s.log.Debug().Msgf("runsScheduler")
s.log.Debug().Msg("runsScheduler")
var runs []*types.Run
err := s.d.Do(ctx, func(tx *sql.Tx) error {
var err error
@ -1492,7 +1492,7 @@ func (s *Runservice) runScheduler(ctx context.Context, r *types.Run) error {
func (s *Runservice) finishedRunsArchiverLoop(ctx context.Context) {
for {
s.log.Debug().Msgf("finished run archiver loop")
s.log.Debug().Msg("finished run archiver loop")
if err := s.finishedRunsArchiver(ctx); err != nil {
s.log.Err(err).Send()
@ -1508,7 +1508,7 @@ func (s *Runservice) finishedRunsArchiverLoop(ctx context.Context) {
}
func (s *Runservice) finishedRunsArchiver(ctx context.Context) error {
s.log.Debug().Msgf("finished run archiver")
s.log.Debug().Msg("finished run archiver")
var runs []*types.Run
err := s.d.Do(ctx, func(tx *sql.Tx) error {
var err error
@ -1596,7 +1596,7 @@ func (s *Runservice) cacheCleanerLoop(ctx context.Context, cacheExpireInterval t
}
func (s *Runservice) cacheCleaner(ctx context.Context, cacheExpireInterval time.Duration) error {
s.log.Debug().Msgf("cacheCleaner")
s.log.Debug().Msg("cacheCleaner")
l := s.lf.NewLock(common.CacheCleanerLockKey)
if err := l.Lock(ctx); err != nil {
@ -1621,7 +1621,7 @@ func (s *Runservice) cacheCleaner(ctx context.Context, cacheExpireInterval time.
}
func (s *Runservice) workspaceCleanerLoop(ctx context.Context, workspaceExpireInterval time.Duration) {
s.log.Debug().Msgf("workspaceCleanerLoop")
s.log.Debug().Msg("workspaceCleanerLoop")
for {
if err := s.objectsCleaner(ctx, store.OSTArchivesBaseDir(), common.WorkspaceCleanerLockKey, workspaceExpireInterval); err != nil {
@ -1638,11 +1638,11 @@ func (s *Runservice) workspaceCleanerLoop(ctx context.Context, workspaceExpireIn
}
func (s *Runservice) logCleanerLoop(ctx context.Context, logExpireInterval time.Duration) {
s.log.Debug().Msgf("logCleanerLoop")
s.log.Debug().Msg("logCleanerLoop")
for {
if err := s.objectsCleaner(ctx, store.OSTLogsBaseDir(), common.LogCleanerLockKey, logExpireInterval); err != nil {
s.log.Warn().Err(err).Msgf("objectsCleaner error")
s.log.Warn().Err(err).Msg("objectsCleaner error")
}
sleepCh := time.NewTimer(logCleanerInterval).C

4
internal/services/scheduler/scheduler.go
View File

@ -70,7 +70,7 @@ func (s *Scheduler) schedule(ctx context.Context) error {
for groupID := range groups {
if err := s.scheduleRun(ctx, groupID); err != nil {
s.log.Err(err).Msgf("scheduler err")
s.log.Err(err).Msg("scheduler err")
}
}
@ -209,7 +209,7 @@ func (s *Scheduler) Run(ctx context.Context) error {
go s.approveLoop(ctx)
<-ctx.Done()
log.Info().Msgf("scheduler exiting")
log.Info().Msg("scheduler exiting")
return nil
}

2
internal/util/dump.go
View File

@ -24,7 +24,7 @@ import (
// direct call to litter.Sdump.
// In this way litter.Sdump will be executed only when really needed without
// consuming CPU when not required.
// I.E. if logging with zerolog using log.Debug().Msgf("dumped value: ", util.Dump(value)),
// I.E. if logging with zerolog using log.Debug().Msg("dumped value: ", util.Dump(value)),
// the formatting (and so the call to litter.Sdump) won't happen if the log
// level is less than debug.
type dump struct {