From d61e3fb1302a1f8aa12c655b637af07e6297bf9a Mon Sep 17 00:00:00 2001
From: Igor Postelnik <igor@cloudflare.com>
Date: Mon, 20 Jul 2020 17:34:02 -0500
Subject: [PATCH] TUN-3190: Initialize logger using command line flags in
 tunnels subcommands

---
 cmd/cloudflared/tunnel/subcommands.go | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/cmd/cloudflared/tunnel/subcommands.go b/cmd/cloudflared/tunnel/subcommands.go
index 51cde9ea..1dbcec61 100644
--- a/cmd/cloudflared/tunnel/subcommands.go
+++ b/cmd/cloudflared/tunnel/subcommands.go
@@ -88,7 +88,7 @@ func createTunnel(c *cli.Context) error {
 	}
 	name := c.Args().First()
 
-	logger, err := logger.New()
+	logger, err := createLogger(c, false)
 	if err != nil {
 		return errors.Wrap(err, "error setting up logger")
 	}
@@ -220,7 +220,7 @@ func buildListCommand() *cli.Command {
 }
 
 func listTunnels(c *cli.Context) error {
-	logger, err := logger.New()
+	logger, err := createLogger(c, false)
 	if err != nil {
 		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")
 	}
 
-	logger, err := logger.New()
+	logger, err := createLogger(c, false)
 	if err != nil {
 		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")
 	}
 
-	logger, err := logger.New()
+	logger, err := createLogger(c, false)
 	if err != nil {
 		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.`)
 	}
 
-	logger, err := logger.New()
+	logger, err := createLogger(c, false)
 	if err != nil {
 		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")
 	}
 
-	logger, err := logger.New()
+	logger, err := createLogger(c, false)
 	if err != nil {
 		return errors.Wrap(err, "error setting up logger")
 	}
@@ -543,7 +543,12 @@ func routeTunnel(c *cli.Context) error {
 	}
 
 	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) {