Skip to content

Commit d61e3fb

Browse files
committed
TUN-3190: Initialize logger using command line flags in tunnels subcommands
1 parent ca7d679 commit d61e3fb

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

cmd/cloudflared/tunnel/subcommands.go

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func createTunnel(c *cli.Context) error {
8888
}
8989
name := c.Args().First()
9090

91-
logger, err := logger.New()
91+
logger, err := createLogger(c, false)
9292
if err != nil {
9393
return errors.Wrap(err, "error setting up logger")
9494
}
@@ -220,7 +220,7 @@ func buildListCommand() *cli.Command {
220220
}
221221

222222
func listTunnels(c *cli.Context) error {
223-
logger, err := logger.New()
223+
logger, err := createLogger(c, false)
224224
if err != nil {
225225
return errors.Wrap(err, "error setting up logger")
226226
}
@@ -327,7 +327,7 @@ func deleteTunnel(c *cli.Context) error {
327327
return errors.Wrap(err, "error parsing tunnel ID")
328328
}
329329

330-
logger, err := logger.New()
330+
logger, err := createLogger(c, false)
331331
if err != nil {
332332
return errors.Wrap(err, "error setting up logger")
333333
}
@@ -437,7 +437,7 @@ func runTunnel(c *cli.Context) error {
437437
return errors.Wrap(err, "error parsing tunnel ID")
438438
}
439439

440-
logger, err := logger.New()
440+
logger, err := createLogger(c, false)
441441
if err != nil {
442442
return errors.Wrap(err, "error setting up logger")
443443
}
@@ -465,7 +465,7 @@ func cleanupConnections(c *cli.Context) error {
465465
return cliutil.UsageError(`"cloudflared tunnel cleanup" requires at least 1 argument, the IDs of the tunnels to cleanup connections.`)
466466
}
467467

468-
logger, err := logger.New()
468+
logger, err := createLogger(c, false)
469469
if err != nil {
470470
return errors.Wrap(err, "error setting up logger")
471471
}
@@ -515,7 +515,7 @@ func routeTunnel(c *cli.Context) error {
515515
return errors.Wrap(err, "error parsing tunnel ID")
516516
}
517517

518-
logger, err := logger.New()
518+
logger, err := createLogger(c, false)
519519
if err != nil {
520520
return errors.Wrap(err, "error setting up logger")
521521
}
@@ -543,7 +543,12 @@ func routeTunnel(c *cli.Context) error {
543543
}
544544

545545
client := newTunnelstoreClient(c, cert, logger)
546-
return client.RouteTunnel(tunnelID, route)
546+
547+
if err := client.RouteTunnel(tunnelID, route); err != nil {
548+
return errors.Wrap(err, "Failed to route tunnel")
549+
}
550+
551+
return nil
547552
}
548553

549554
func dnsRouteFromArg(c *cli.Context, tunnelID uuid.UUID) (tunnelstore.Route, error) {

0 commit comments

Comments
 (0)