ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plugin: better logging

This commit is contained in:
Mitchell Hashimoto 2014-07-24 07:17:14 -07:00
parent e81e9d6d73
commit e0f2197d6c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugin/client.go
View File

@ -11,6 +11,7 @@ import (
"net/rpc" "net/rpc"
"os" "os"
"os/exec" "os/exec"
"path/filepath"
"strings" "strings"
"sync" "sync"
"time" "time"
@ -217,7 +218,7 @@ func (c *Client) Start() (addr net.Addr, err error) {
cmd.Stderr = stderr_w cmd.Stderr = stderr_w
cmd.Stdout = stdout_w cmd.Stdout = stdout_w
log.Printf("Starting plugin: %s %#v", cmd.Path, cmd.Args) log.Printf("[DEBUG] Starting plugin: %s %#v", cmd.Path, cmd.Args)
err = cmd.Start() err = cmd.Start()
if err != nil { if err != nil {
return return
@ -248,7 +249,7 @@ func (c *Client) Start() (addr net.Addr, err error) {
cmd.Wait() cmd.Wait()
// Log and make sure to flush the logs write away // Log and make sure to flush the logs write away
log.Printf("%s: plugin process exited\n", cmd.Path) log.Printf("[DEBUG] %s: plugin process exited\n", cmd.Path)
os.Stderr.Sync() os.Stderr.Sync()
// Mark that we exited // Mark that we exited
@ -295,7 +296,7 @@ func (c *Client) Start() (addr net.Addr, err error) {
timeout := time.After(c.config.StartTimeout) timeout := time.After(c.config.StartTimeout)
// Start looking for the address // Start looking for the address
log.Printf("Waiting for RPC address for: %s", cmd.Path) log.Printf("[DEBUG] Waiting for RPC address for: %s", cmd.Path)
select { select {
case <-timeout: case <-timeout:
err = errors.New("timeout while waiting for plugin to start") err = errors.New("timeout while waiting for plugin to start")
@ -343,7 +344,7 @@ func (c *Client) logStderr(r io.Reader) {
c.config.Stderr.Write([]byte(line)) c.config.Stderr.Write([]byte(line))
line = strings.TrimRightFunc(line, unicode.IsSpace) line = strings.TrimRightFunc(line, unicode.IsSpace)
log.Printf("%s: %s", c.config.Cmd.Path, line) log.Printf("%s: %s", filepath.Base(c.config.Cmd.Path), line)
} }
if err == io.EOF { if err == io.EOF {