From c716dd273c4e88a3b514c2b1ffebf058b8d37b53 Mon Sep 17 00:00:00 2001 From: Dalton Date: Thu, 11 Jun 2020 11:08:05 -0500 Subject: [PATCH] AUTH-2648 updated usage text --- cmd/cloudflared/main.go | 2 +- cmd/cloudflared/tunnel/cmd.go | 3 +++ h2mux/muxwriter.go | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/cloudflared/main.go b/cmd/cloudflared/main.go index 0f35a421..561af284 100644 --- a/cmd/cloudflared/main.go +++ b/cmd/cloudflared/main.go @@ -61,7 +61,7 @@ func main() { app := &cli.App{} app.Name = "cloudflared" app.Usage = "Cloudflare's command-line tool and agent" - app.ArgsUsage = "origin-url" + app.UsageText = "cloudflared [global options] [command] [command options]" app.Copyright = fmt.Sprintf( `(c) %d Cloudflare Inc. Your installation of cloudflared software constitutes a symbol of your signature indicating that you accept diff --git a/cmd/cloudflared/tunnel/cmd.go b/cmd/cloudflared/tunnel/cmd.go index c909c809..84195b12 100644 --- a/cmd/cloudflared/tunnel/cmd.go +++ b/cmd/cloudflared/tunnel/cmd.go @@ -223,6 +223,9 @@ func createLogger(c *cli.Context, isTransport bool) (logger.Service, error) { logLevel := c.String("loglevel") if isTransport { logLevel = c.String("transport-loglevel") + if logLevel == "" { + logLevel = "fatal" + } } loggerOpts = append(loggerOpts, logger.LogLevelString(logLevel)) diff --git a/h2mux/muxwriter.go b/h2mux/muxwriter.go index c3844592..d2b955c1 100644 --- a/h2mux/muxwriter.go +++ b/h2mux/muxwriter.go @@ -204,7 +204,7 @@ func (w *MuxWriter) writeStreamData(stream *MuxedStream, logger logger.Service) } // update the amount of data wrote w.bytesWrote.IncrementBy(uint64(len(payload))) - logger.Errorf("mux - write: output data: %d: streamID: %d", len(payload), stream.streamID) + logger.Debugf("mux - write: output data: %d: streamID: %d", len(payload), stream.streamID) if sentEOF { if stream.readBuffer.Closed() {