Merge pull request #43 from bfirsh/add-start-to-apiserver

This commit is contained in:
Solomon Hykes 2014-06-06 18:53:46 -07:00
commit a5b1106ffd
3 changed files with 34 additions and 7 deletions

View File

@ -58,7 +58,28 @@ func getContainersJSON(out beam.Sender, version version.Version, w http.Response
return err
}
return writeJSON(w, 200, names)
return writeJSON(w, http.StatusOK, names)
}
func postContainersStart(out beam.Sender, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
if vars == nil {
return fmt.Errorf("Missing parameter")
}
// TODO: r.Body
name := vars["name"]
_, containerOut, err := beam.Obj(out).Attach(name)
container := beam.Obj(containerOut)
if err != nil {
return err
}
if err := container.Start(); err != nil {
return err
}
w.WriteHeader(http.StatusNoContent)
return nil
}
func createRouter(out beam.Sender) (*mux.Router, error) {
@ -68,7 +89,9 @@ func createRouter(out beam.Sender) (*mux.Router, error) {
"/_ping": ping,
"/containers/json": getContainersJSON,
},
"POST": {},
"POST": {
"/containers/{name:.*}/start": postContainersStart,
},
"DELETE": {},
"OPTIONS": {},
}

View File

@ -11,7 +11,6 @@ func Debug() beam.Sender {
backend := beam.NewServer()
backend.OnSpawn(beam.Handler(func(ctx *beam.Message) error {
instance := beam.Task(func(in beam.Receiver, out beam.Sender) {
fmt.Printf("debug backend!")
for {
msg, err := in.Receive(beam.Ret)
if err != nil {

View File

@ -46,10 +46,15 @@ type forwarder struct {
}
func (f *forwarder) attach(ctx *beam.Message) error {
ctx.Ret.Send(&beam.Message{Verb: beam.Ack, Ret: f.Server})
for {
time.Sleep(1 * time.Second)
(&beam.Object{ctx.Ret}).Log("forward: heartbeat")
if ctx.Args[0] == "" {
ctx.Ret.Send(&beam.Message{Verb: beam.Ack, Ret: f.Server})
for {
time.Sleep(1 * time.Second)
(&beam.Object{ctx.Ret}).Log("forward: heartbeat")
}
} else {
c := f.newContainer(ctx.Args[0])
ctx.Ret.Send(&beam.Message{Verb: beam.Ack, Ret: c})
}
return nil
}