curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-3190: Initialize logger using command line flags in tunnels subcommands

This commit is contained in:
Igor Postelnik 2020-07-20 17:34:02 -05:00
parent ca7d6797e1
commit d61e3fb130
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/cloudflared/tunnel/subcommands.go
View File

@ -88,7 +88,7 @@ func createTunnel(c *cli.Context) error {
} }
name := c.Args().First() name := c.Args().First()
logger, err := logger.New() logger, err := createLogger(c, false)
if err != nil { if err != nil {
return errors.Wrap(err, "error setting up logger") return errors.Wrap(err, "error setting up logger")
} }
@ -220,7 +220,7 @@ func buildListCommand() *cli.Command {
} }
func listTunnels(c *cli.Context) error { func listTunnels(c *cli.Context) error {
logger, err := logger.New() logger, err := createLogger(c, false)
if err != nil { if err != nil {
return errors.Wrap(err, "error setting up logger") return errors.Wrap(err, "error setting up logger")
} }
@ -327,7 +327,7 @@ func deleteTunnel(c *cli.Context) error {
return errors.Wrap(err, "error parsing tunnel ID") return errors.Wrap(err, "error parsing tunnel ID")
} }
logger, err := logger.New() logger, err := createLogger(c, false)
if err != nil { if err != nil {
return errors.Wrap(err, "error setting up logger") return errors.Wrap(err, "error setting up logger")
} }
@ -437,7 +437,7 @@ func runTunnel(c *cli.Context) error {
return errors.Wrap(err, "error parsing tunnel ID") return errors.Wrap(err, "error parsing tunnel ID")
} }
logger, err := logger.New() logger, err := createLogger(c, false)
if err != nil { if err != nil {
return errors.Wrap(err, "error setting up logger") return errors.Wrap(err, "error setting up logger")
} }
@ -465,7 +465,7 @@ func cleanupConnections(c *cli.Context) error {
return cliutil.UsageError(`"cloudflared tunnel cleanup" requires at least 1 argument, the IDs of the tunnels to cleanup connections.`) return cliutil.UsageError(`"cloudflared tunnel cleanup" requires at least 1 argument, the IDs of the tunnels to cleanup connections.`)
} }
logger, err := logger.New() logger, err := createLogger(c, false)
if err != nil { if err != nil {
return errors.Wrap(err, "error setting up logger") return errors.Wrap(err, "error setting up logger")
} }
@ -515,7 +515,7 @@ func routeTunnel(c *cli.Context) error {
return errors.Wrap(err, "error parsing tunnel ID") return errors.Wrap(err, "error parsing tunnel ID")
} }
logger, err := logger.New() logger, err := createLogger(c, false)
if err != nil { if err != nil {
return errors.Wrap(err, "error setting up logger") return errors.Wrap(err, "error setting up logger")
} }
@ -543,7 +543,12 @@ func routeTunnel(c *cli.Context) error {
} }
client := newTunnelstoreClient(c, cert, logger) client := newTunnelstoreClient(c, cert, logger)
return client.RouteTunnel(tunnelID, route)
if err := client.RouteTunnel(tunnelID, route); err != nil {
return errors.Wrap(err, "Failed to route tunnel")
}
return nil
} }
func dnsRouteFromArg(c *cli.Context, tunnelID uuid.UUID) (tunnelstore.Route, error) { func dnsRouteFromArg(c *cli.Context, tunnelID uuid.UUID) (tunnelstore.Route, error) {