alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

update titan, other deps and minor changes

Browse Source
This commit is contained in:
Pedro Nasser
2016-08-24 16:11:21 -03:00
parent 08267e6475
commit 6a2e9b29be
6 changed files with 98 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
api/runner/runner.go
View File

@@ -7,7 +7,6 @@ import (
"golang.org/x/net/context"
"github.com/iron-io/functions/api/models"
"github.com/iron-io/titan/common"
"github.com/iron-io/titan/runner/agent"
"github.com/iron-io/titan/runner/drivers"
@@ -17,15 +16,13 @@ import (
)
type Config struct {
ID string
Ctx context.Context
Route *models.Route
Payload string
Timeout time.Duration
RequestURL string
AppName string
Stdout io.Writer
Stderr io.Writer
ID string
Image string
Timeout time.Duration
AppName string
Env map[string]string
Stdout io.Writer
Stderr io.Writer
}
type Runner struct {
@@ -56,6 +53,12 @@ func (r *Runner) Run(ctx context.Context, cfg *Config) (drivers.RunResult, error
auth: &agent.ConfigAuth{},
}
closer, err := r.driver.Prepare(ctx, ctask)
if err != nil {
return nil, err
}
defer closer.Close()
result, err := r.driver.Run(ctx, ctask)
if err != nil {
return nil, err
@@ -64,20 +67,19 @@ func (r *Runner) Run(ctx context.Context, cfg *Config) (drivers.RunResult, error
return result, nil
}
func (r Runner) EnsureUsableImage(cfg *Config) error {
func (r Runner) EnsureUsableImage(ctx context.Context, cfg *Config) error {
ctask := &containerTask{
cfg: cfg,
auth: &agent.ConfigAuth{},
}
err := r.driver.EnsureUsableImage(cfg.Ctx, ctask)
err := r.driver.EnsureUsableImage(ctx, ctask)
if err != nil {
return err
}
return nil
}
func selectDriver(driver string, env *common.Environment, conf *driverscommon.Config) (drivers.Driver, error) {
switch driver {
case "docker":