remove timestamps from logger inside of subprocesses to prevent double logging; also remove some cruft and fix spelling in some logs
This commit is contained in:
parent
5d5189a9a2
commit
a14498ff00
12
main.go
12
main.go
|
@ -62,8 +62,6 @@ func realMain() int {
|
|||
|
||||
packer.LogSecretFilter.SetOutput(logWriter)
|
||||
|
||||
//packer.LogSecrets.
|
||||
|
||||
// Disable logging here
|
||||
log.SetOutput(ioutil.Discard)
|
||||
|
||||
|
@ -137,12 +135,16 @@ func wrappedMain() int {
|
|||
packer.LogSecretFilter.SetOutput(os.Stderr)
|
||||
log.SetOutput(&packer.LogSecretFilter)
|
||||
|
||||
inPlugin := os.Getenv(plugin.MagicCookieKey) == plugin.MagicCookieValue
|
||||
if inPlugin {
|
||||
// This prevents double-logging timestamps
|
||||
log.SetFlags(0)
|
||||
}
|
||||
|
||||
log.Printf("[INFO] Packer version: %s", version.FormattedVersion())
|
||||
log.Printf("Packer Target OS/Arch: %s %s", runtime.GOOS, runtime.GOARCH)
|
||||
log.Printf("Built with Go Version: %s", runtime.Version())
|
||||
|
||||
inPlugin := os.Getenv(plugin.MagicCookieKey) == plugin.MagicCookieValue
|
||||
|
||||
config, err := loadConfig()
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Error loading configuration: \n\n%s\n", err)
|
||||
|
@ -195,7 +197,7 @@ func wrappedMain() int {
|
|||
currentPID := os.Getpid()
|
||||
backgrounded, err := checkProcess(currentPID)
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "cannot determind if process is in "+
|
||||
fmt.Fprintf(os.Stderr, "cannot determine if process is in "+
|
||||
"background: %s\n", err)
|
||||
}
|
||||
if backgrounded {
|
||||
|
|
Loading…
Reference in New Issue