Merge pull request #424 from fnproject/call-listener

CallListener - replaces RunnerListener
This commit is contained in:
Reed Allman
2017-10-26 10:36:14 -07:00
committed by GitHub
10 changed files with 111 additions and 79 deletions

View File

@@ -15,6 +15,7 @@ import (
"github.com/fnproject/fn/api/agent/drivers/docker"
"github.com/fnproject/fn/api/agent/protocol"
"github.com/fnproject/fn/api/common"
"github.com/fnproject/fn/api/extensions"
"github.com/fnproject/fn/api/id"
"github.com/fnproject/fn/api/models"
"github.com/opentracing/opentracing-go"
@@ -110,12 +111,14 @@ type Agent interface {
// Return the http.Handler used to handle Prometheus metric requests
PromHandler() http.Handler
AddCallListener(extensions.CallListener)
}
type agent struct {
// TODO maybe these should be on GetCall? idk. was getting bloated.
mq models.MessageQueue
ds models.Datastore
mq models.MessageQueue
ds models.Datastore
callListeners []extensions.CallListener
driver drivers.Driver
@@ -207,7 +210,7 @@ func (a *agent) Submit(callI Call) error {
defer slot.Close() // notify our slot is free once we're done
// TODO Start is checking the timer now, we could do it here, too.
err = call.Start(ctx)
err = call.Start(ctx, a)
if err != nil {
a.stats.Dequeue(callI.Model().Path)
return err
@@ -231,8 +234,7 @@ func (a *agent) Submit(callI Call) error {
// TODO: we need to allocate more time to store the call + logs in case the call timed out,
// but this could put us over the timeout if the call did not reply yet (need better policy).
ctx = opentracing.ContextWithSpan(context.Background(), span)
call.End(ctx, err)
err = call.End(ctx, err, a)
return err
}