Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix windows log levels #429

Merged
merged 1 commit into from
Feb 21, 2019
Merged

Fix windows log levels #429

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions cmd/launcher/svc_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package main

import (
"context"
"fmt"
"os"
"time"

Expand Down Expand Up @@ -37,13 +38,22 @@ func runWindowsSvc(args []string) error {
os.Exit(1)
}

// Now that we've parsed the options, let's set a filter on our logger
if opts.debug {
logger = level.NewFilter(logger, level.AllowDebug())
} else {
logger = level.NewFilter(logger, level.AllowInfo())
}

run := svc.Run

return run(serviceName, &winSvc{logger: logger, opts: opts})
}

func runWindowsSvcForeground(args []string) error {
logger := logutil.NewCLILogger(true) //interactive
// Foreground mode is inherently a debug mode. So we start the
// logger in debugging mode, instead of looking at opts.debug
logger := logutil.NewCLILogger(true)
level.Debug(logger).Log("msg", "foreground service start requested (debug mode)")

opts, err := parseOptions(os.Args[2:])
Expand Down Expand Up @@ -74,7 +84,7 @@ func (w *winSvc) Execute(args []string, r <-chan svc.ChangeRequest, changes chan
go func() {
err := runLauncher(ctx, cancel, w.opts, w.logger)
if err != nil {
level.Info(w.logger).Log("err", err)
level.Info(w.logger).Log("err", err, "stack", fmt.Sprintf("%+v", err))
changes <- svc.Status{State: svc.Stopped, Accepts: cmdsAccepted}
os.Exit(1)
}
Expand Down