Cadoles/bouncer
Cadoles
/
bouncer
10
0
Fork 0
Code Issues 2 Pull Requests 1 Projects Releases 3 Wiki Activity

chore: add log message for workdir and configuration loading
Cadoles/bouncer/pipeline/head This commit looks good Details

This commit is contained in:
wpetit 2023-06-29 20:16:25 -06:00
parent ff1d01828d
commit 74928fe413
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/command/common/load_config.go
View File

@ -4,6 +4,7 @@ import (
"forge.cadoles.com/cadoles/bouncer/internal/config" "forge.cadoles.com/cadoles/bouncer/internal/config"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"gitlab.com/wpetit/goweb/logger"
) )
func LoadConfig(ctx *cli.Context) (*config.Config, error) { func LoadConfig(ctx *cli.Context) (*config.Config, error) {
@ -15,11 +16,15 @@ func LoadConfig(ctx *cli.Context) (*config.Config, error) {
) )
if configFile != "" { if configFile != "" {
logger.Info(ctx.Context, "loading config", logger.F("config", configFile))
conf, err = config.NewFromFile(configFile) conf, err = config.NewFromFile(configFile)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "Could not load config file '%s'", configFile) return nil, errors.Wrapf(err, "Could not load config file '%s'", configFile)
} }
} else { } else {
logger.Info(ctx.Context, "using default config")
conf = config.NewDefault() conf = config.NewDefault()
} }

3
internal/command/main.go
View File

@ -9,6 +9,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"gitlab.com/wpetit/goweb/logger"
) )
func Main(buildDate, projectVersion, gitRef, defaultConfigPath string, commands ...*cli.Command) { func Main(buildDate, projectVersion, gitRef, defaultConfigPath string, commands ...*cli.Command) {
@ -29,6 +30,8 @@ func Main(buildDate, projectVersion, gitRef, defaultConfigPath string, commands
workdir := ctx.String("workdir") workdir := ctx.String("workdir")
// Switch to new working directory if defined // Switch to new working directory if defined
if workdir != "" { if workdir != "" {
logger.Info(ctx.Context, "changing working directory", logger.F("workdir", workdir))
if err := os.Chdir(workdir); err != nil { if err := os.Chdir(workdir); err != nil {
return errors.Wrap(err, "could not change working directory") return errors.Wrap(err, "could not change working directory")
} }