Merge pull request #38 from Netflix/add-disable-journald-hook

Add mechanism to disable journald logging when executing titus-vpc-tool

cmd/titus-vpc-tool/main.go

@@ -28,6 +28,10 @@ func main() {
 			Name:  "log-level",
 			Value: "info",
 		},
+		cli.BoolTFlag{
+			Name:  "journald",
+			Usage: "Allows disabling the journald logging hook -- is enabled by default",
+		},
 	}
 	app.Commands = []cli.Command{
 		setup.Setup,

vpc/context/context.go

@@ -36,14 +36,18 @@ type VPCContext struct {
 
 func newVPCContext(cliContext *cli.Context) (*VPCContext, error) {
 	logger := logrus.New()
-	logger.Hooks.Add(&journalhook.JournalHook{})
 	// Setup log level
 	level, err := logrus.ParseLevel(cliContext.GlobalString("log-level"))
 	if err != nil {
 		return nil, cli.NewMultiError(cli.NewExitError("Invalid log level", 1), err)
 	}
 	logger.Level = level
 
+	if cliContext.GlobalBoolT("journald") {
+		logger.Hooks.Add(&journalhook.JournalHook{})
+	} else {
+		logger.Info("Disabling journald hook")
+	}
 	ret := &VPCContext{
 		Context:    context.Background(),
 		CLIContext: cliContext,