docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove the heartbeat 

- logging clean up

Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com> (github: aaronfeng)
This commit is contained in:
Aaron Feng 2014-06-19 01:53:37 -04:00
parent 11ec16e08d
commit f9f5d4c4a0
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
backends/ec2.go
View File

@ -29,7 +29,6 @@ type ec2Client struct {
} }
func (c *ec2Client) get(ctx *beam.Message) error { func (c *ec2Client) get(ctx *beam.Message) error {
fmt.Println("*** ec2 Get ***")
output, err := c.dockerInstance.Get() output, err := c.dockerInstance.Get()
if (err != nil) { if (err != nil) {
return err return err
@ -39,12 +38,10 @@ func (c *ec2Client) get(ctx *beam.Message) error {
} }
func (c *ec2Client) start(ctx *beam.Message) error { func (c *ec2Client) start(ctx *beam.Message) error {
fmt.Println("*** ec2 OnStart ***")
if instance, err := c.findInstance(); err != nil { if instance, err := c.findInstance(); err != nil {
return err return err
} else if instance != nil { } else if instance != nil {
fmt.Println("*** found existing instance ****") fmt.Printf("Found existing instance: %s\n", instance.InstanceId)
c.instance = instance c.instance = instance
} else { } else {
if err := c.startInstance(); err != nil { if err := c.startInstance(); err != nil {
@ -62,20 +59,20 @@ func (c *ec2Client) start(ctx *beam.Message) error {
} }
func (c *ec2Client) log(ctx *beam.Message) error { func (c *ec2Client) log(ctx *beam.Message) error {
fmt.Println("*** ec2 OnLog ***")
ctx.Ret.Send(&beam.Message{Verb: beam.Ack, Ret: c.Server}) ctx.Ret.Send(&beam.Message{Verb: beam.Ack, Ret: c.Server})
return nil return nil
} }
func (c *ec2Client) spawn(ctx *beam.Message) error { func (c *ec2Client) spawn(ctx *beam.Message) error {
fmt.Println("*** ec2 OnSpawn ***") out, err := c.dockerInstance.Spawn(ctx.Args...)
c.dockerInstance.Spawn(ctx.Args...) if err != nil {
ctx.Ret.Send(&beam.Message{Verb: beam.Ack, Ret: c.Server}) return err
}
ctx.Ret.Send(&beam.Message{Verb: beam.Ack, Ret: out})
return nil return nil
} }
func (c *ec2Client) ls(ctx *beam.Message) error { func (c *ec2Client) ls(ctx *beam.Message) error {
fmt.Println("*** ec2 OnLs ***")
output, err := c.dockerInstance.Ls() output, err := c.dockerInstance.Ls()
if (err != nil) { if (err != nil) {
return err return err
@ -85,25 +82,19 @@ func (c *ec2Client) ls(ctx *beam.Message) error {
} }
func (c *ec2Client) error(ctx *beam.Message) error { func (c *ec2Client) error(ctx *beam.Message) error {
fmt.Println("*** ec2 OnError ***")
ctx.Ret.Send(&beam.Message{Verb: beam.Ack, Ret: c.Server}) ctx.Ret.Send(&beam.Message{Verb: beam.Ack, Ret: c.Server})
return nil return nil
} }
func (c *ec2Client) stop(ctx *beam.Message) error { func (c *ec2Client) stop(ctx *beam.Message) error {
fmt.Println("*** ec2 OnStop ***")
ctx.Ret.Send(&beam.Message{Verb: beam.Ack, Ret: c.Server}) ctx.Ret.Send(&beam.Message{Verb: beam.Ack, Ret: c.Server})
return nil return nil
} }
func (c *ec2Client) attach(ctx *beam.Message) error { func (c *ec2Client) attach(ctx *beam.Message) error {
fmt.Println("*** ec2 OnAttach ***")
if ctx.Args[0] == "" { if ctx.Args[0] == "" {
ctx.Ret.Send(&beam.Message{Verb: beam.Ack, Ret: c.Server}) ctx.Ret.Send(&beam.Message{Verb: beam.Ack, Ret: c.Server})
for { <-make(chan struct{})
time.Sleep(1 * time.Second)
(&beam.Object{ctx.Ret}).Log("ec2: heartbeat")
}
} else { } else {
_, out, err := c.dockerInstance.Attach(ctx.Args[0]) _, out, err := c.dockerInstance.Attach(ctx.Args[0])
if err != nil { if err != nil {
@ -272,8 +263,6 @@ func (c *ec2Client) initDockerClientInstance(instance *ec2.Instance) error {
func Ec2() beam.Sender { func Ec2() beam.Sender {
backend := beam.NewServer() backend := beam.NewServer()
backend.OnSpawn(beam.Handler(func(ctx *beam.Message) error { backend.OnSpawn(beam.Handler(func(ctx *beam.Message) error {
fmt.Println("*** init ***")
var config, err = newConfig(ctx.Args) var config, err = newConfig(ctx.Args)
if (err != nil) { if (err != nil) {