Skip to content

Commit d6cb622

Browse files
author
Scott Weiss
committed
fix log file issues
fixes #32 Signed-off-by: Scott Weiss <scott.weiss@emc.com>
1 parent 43a375f commit d6cb622

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

cmd/daemon.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,29 +45,30 @@ Example usage:
4545
if err := readDaemonConfig(); err != nil {
4646
return err
4747
}
48+
//don't print vsphere password
49+
redactions := []string{}
50+
for _, vsphereConfig := range daemonConfig.Providers.Vsphere {
51+
redactions = append(redactions, vsphereConfig.VspherePassword, url.QueryEscape(vsphereConfig.VspherePassword))
52+
}
53+
logrus.SetFormatter(&unikutil.RedactedTextFormatter{
54+
Redactions: redactions,
55+
})
56+
4857
if debugMode {
4958
logrus.SetLevel(logrus.DebugLevel)
5059
}
5160
if trace {
5261
logrus.AddHook(&unikutil.AddTraceHook{true})
5362
}
5463
if logFile != "" {
55-
f, err := os.Open(logFile)
64+
os.Create(logFile)
65+
f, err := os.OpenFile(logFile, os.O_WRONLY | os.O_CREATE | os.O_TRUNC, 0777)
5666
if err != nil {
5767
return errors.New(fmt.Sprintf("failed to open log file %s for writing", logFile), err)
5868
}
5969
logrus.AddHook(&unikutil.TeeHook{f})
6070
}
6171

62-
//don't print vsphere password
63-
redactions := []string{}
64-
for _, vsphereConfig := range daemonConfig.Providers.Vsphere {
65-
redactions = append(redactions, vsphereConfig.VspherePassword, url.QueryEscape(vsphereConfig.VspherePassword))
66-
}
67-
logrus.SetFormatter(&unikutil.RedactedTextFormatter{
68-
Redactions: redactions,
69-
})
70-
7172
logrus.WithField("config", daemonConfig).Info("daemon started")
7273
d, err := daemon.NewUnikDaemon(daemonConfig)
7374
if err != nil {

pkg/util/log.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func (h *TeeHook) Fire(entry *logrus.Entry) error {
125125
logger.WithFields(entry.Data).Info(entry.Message)
126126
break
127127
case logrus.DebugLevel:
128-
logger.WithFields(entry.Data).Debug(entry.Message)
128+
logger.WithFields(entry.Data).Info(entry.Message)
129129
break
130130
}
131131
return nil

0 commit comments

Comments
 (0)