packer: Log UI output

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

View File

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

View File

@ -3,6 +3,7 @@ package packer
import (
"fmt"
"io"
"log"
)
// 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{}) {
_, 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 {
panic(err)
}
}
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 {
panic(err)
}