Skip to content

Commit

Permalink
refactor log output formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
tj committed Mar 1, 2018
1 parent 533205f commit 0f0416a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 14 deletions.
9 changes: 4 additions & 5 deletions http/relay/relay.go
Expand Up @@ -121,13 +121,13 @@ func (p *Proxy) Start() error {

start := time.Now()
timeout := time.Duration(p.config.Proxy.ListenTimeout) * time.Second
ctx.WithField("url", p.target.String()).Info("starting server")
ctx.Info("waiting for app to listen on PORT")

if err := util.WaitForListen(p.target, timeout); err != nil {
return errors.Wrapf(err, "waiting for %s to be in listening state", p.target.String())
}

ctx.WithField("duration", util.MillisecondsSince(start)).Info("started server")
ctx.WithField("duration", util.MillisecondsSince(start)).Info("app listening")
return nil
}

Expand Down Expand Up @@ -256,7 +256,6 @@ func (p *Proxy) start() error {
return errors.Wrap(err, "getting free port")
}

ctx.WithField("port", port).Info("found free port")
target, err := url.Parse(fmt.Sprintf("http://127.0.0.1:%d", port))
if err != nil {
return errors.Wrap(err, "parsing url")
Expand All @@ -265,15 +264,15 @@ func (p *Proxy) start() error {
p.port = port
p.target = target

ctx.WithField("command", p.config.Proxy.Command).Info("executing")
ctx.WithField("command", p.config.Proxy.Command).WithField("PORT", port).Info("starting app")
cmd = p.command(p.config.Proxy.Command, p.environment())
if err := cmd.Start(); err != nil {
return errors.Wrap(err, "running command")
}

// Only remember this if it was successfully started
p.cmd = cmd
ctx.WithField("pid", cmd.Process.Pid).Info("proxy started")
ctx.WithField("pid", cmd.Process.Pid).Info("started app")

return nil
}
Expand Down
4 changes: 2 additions & 2 deletions internal/cli/start/start.go
Expand Up @@ -27,7 +27,7 @@ func init() {

command := cmd.Flag("command", "Proxy command override").Short('c').String()
open := cmd.Flag("open", "Open endpoint in the browser.").Short('o').Bool()
addr := cmd.Flag("address", "Address for server.").Default(":3000").String()
addr := cmd.Flag("address", "Address for server.").Default("localhost:3000").String()

cmd.Action(func(_ *kingpin.ParseContext) error {
log.SetHandler(text.New(os.Stdout))
Expand Down Expand Up @@ -73,7 +73,7 @@ func init() {
browser.OpenURL(fmt.Sprintf("http://localhost:%s", port))
}

log.WithField("address", *addr).Info("listening")
log.WithField("address", "http://"+*addr).Info("listening")
if err := http.ListenAndServe(*addr, h); err != nil {
return errors.Wrap(err, "binding")
}
Expand Down
9 changes: 2 additions & 7 deletions internal/logs/text/text.go
Expand Up @@ -15,14 +15,9 @@ import (
"github.com/apex/up/internal/util"
)

// TODO: output larger timestamp when older
// TODO: option to output UTC
// TODO: option to truncate
// TODO: move to apex/log?

var (
spacerPlaceholderBytes = []byte("{{spacer}}")
spacerBytes = []byte(" " + colors.Gray(""))
spacerBytes = []byte(colors.Gray(":"))
newlineBytes = []byte("\n")
emptyBytes = []byte("")
)
Expand Down Expand Up @@ -149,7 +144,7 @@ func (h *Handler) handleInline(e *log.Entry) error {
}

fields++
fmt.Fprintf(&buf, " %s%s%v", color(name), colors.Gray(": "), value(name, v))
fmt.Fprintf(&buf, " %s%s%v", color(name), colors.Gray("="), value(name, v))
}

b := buf.Bytes()
Expand Down

0 comments on commit 0f0416a

Please sign in to comment.