diff --git a/options/options.go b/options/options.go index da471ab93..47dbc0bd4 100644 --- a/options/options.go +++ b/options/options.go @@ -261,7 +261,7 @@ func (terragruntOptions *TerragruntOptions) Clone(terragruntConfigPath string) * NonInteractive: terragruntOptions.NonInteractive, TerraformCliArgs: util.CloneStringList(terragruntOptions.TerraformCliArgs), WorkingDir: workingDir, - Logger: util.CreateLogEntryWithWriter(terragruntOptions.ErrWriter, workingDir, terragruntOptions.LogLevel), + Logger: terragruntOptions.Logger.WithField("prefix", workingDir), LogLevel: terragruntOptions.LogLevel, Env: util.CloneStringMap(terragruntOptions.Env), Source: terragruntOptions.Source, diff --git a/util/logger.go b/util/logger.go index 9e874e6c8..596056668 100644 --- a/util/logger.go +++ b/util/logger.go @@ -1,8 +1,6 @@ package util import ( - "fmt" - "io" "os" "github.com/hashicorp/hcl/v2" @@ -48,18 +46,6 @@ func CreateLogEntry(prefix string, level logrus.Level) *logrus.Entry { return logger.WithFields(fields) } -// CreateLoggerWithWriter Create a logger around the given output stream and prefix -func CreateLogEntryWithWriter(writer io.Writer, prefix string, level logrus.Level) *logrus.Entry { - if prefix != "" { - prefix = fmt.Sprintf("[%s] ", prefix) - } else { - prefix = fmt.Sprintf("[terragrunt] %s", prefix) - } - logger := CreateLogEntry(prefix, level) - logger.Logger.SetOutput(writer) - return logger -} - // GetDiagnosticsWriter returns a hcl2 parsing diagnostics emitter for the current terminal. func GetDiagnosticsWriter(parser *hclparse.Parser) hcl.DiagnosticWriter { termColor := terminal.IsTerminal(int(os.Stderr.Fd()))