diff options
Diffstat (limited to 'plugin/supervisor.go')
| -rw-r--r-- | plugin/supervisor.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugin/supervisor.go b/plugin/supervisor.go index 0471f7861..58a7aa783 100644 --- a/plugin/supervisor.go +++ b/plugin/supervisor.go @@ -5,7 +5,6 @@ package plugin import ( "fmt" - "os" "os/exec" "path/filepath" "strings" @@ -29,7 +28,7 @@ func NewSupervisor(pluginInfo *model.BundleInfo, parentLogger *mlog.Logger, apiI wrappedLogger := pluginInfo.WrapLogger(parentLogger) hclogAdaptedLogger := &HclogAdapter{ - wrappedLogger: wrappedLogger, + wrappedLogger: wrappedLogger.WithCallerSkip(1), extrasKey: "wrapped_extras", } @@ -50,8 +49,8 @@ func NewSupervisor(pluginInfo *model.BundleInfo, parentLogger *mlog.Logger, apiI HandshakeConfig: Handshake, Plugins: pluginMap, Cmd: exec.Command(executable), - SyncStdout: os.Stdout, - SyncStderr: os.Stdout, + SyncStdout: wrappedLogger.With(mlog.String("source", "plugin_stdout")).StdLogWriter(), + SyncStderr: wrappedLogger.With(mlog.String("source", "plugin_stderr")).StdLogWriter(), Logger: hclogAdaptedLogger, StartTimeout: time.Second * 3, }) |