iSharkFly-Docs/packer-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

packer: Log UI output

Browse Source
This commit is contained in:
Mitchell Hashimoto 2013-05-21 11:40:07 -07:00
parent dfc332f98c
commit 8dfe78dd19
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/amazonebs/builder.go
View File

@ -23,7 +23,7 @@ type config struct {
SourceAmi string `mapstructure:"source_ami"` SourceAmi string `mapstructure:"source_ami"`
InstanceType string `mapstructure:"instance_type"` InstanceType string `mapstructure:"instance_type"`
SSHUsername string `mapstructure:"ssh_username"` SSHUsername string `mapstructure:"ssh_username"`
SSHPort int `mapstructure:"ssh_port"` SSHPort int `mapstructure:"ssh_port"`
// Configuration of the resulting AMI // Configuration of the resulting AMI
AMIName string `mapstructure:"ami_name"` AMIName string `mapstructure:"ami_name"`

9
packer/ui.go
View File

@ -3,6 +3,7 @@ package packer
import ( import (
"fmt" "fmt"
"io" "io"
"log"
) )
// The Ui interface handles all communication for Packer with the outside // The Ui interface handles all communication for Packer with the outside
@ -21,14 +22,18 @@ type ReaderWriterUi struct {
} }
func (rw *ReaderWriterUi) Say(format string, a ...interface{}) { func (rw *ReaderWriterUi) Say(format string, a ...interface{}) {
_, err := fmt.Fprintf(rw.Writer, format+"\n", a...) output := fmt.Sprintf(format, a...)
log.Printf("ui: %s", output)
_, err := fmt.Fprint(rw.Writer, output+"\n")
if err != nil { if err != nil {
panic(err) panic(err)
} }
} }
func (rw *ReaderWriterUi) Error(format string, a ...interface{}) { func (rw *ReaderWriterUi) Error(format string, a ...interface{}) {
_, err := fmt.Fprintf(rw.Writer, format+"\n", a...) output := fmt.Sprintf(format, a...)
log.Printf("ui error: %s", output)
_, err := fmt.Fprint(rw.Writer, output+"\n")
if err != nil { if err != nil {
panic(err) panic(err)
} }