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

Depend on iron-io/runner instead of iron-io/worker (#124)

Browse Source
This commit is contained in:
Seif Lotfy سيف لطفي
2016-10-05 20:42:12 +02:00
committed by GitHub
parent eed5422c59
commit fbcec6bf40
24 changed files with 142 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/runner/metrics.go
View File

@@ -4,7 +4,7 @@ import (
"time"
"github.com/Sirupsen/logrus"
titancommon "github.com/iron-io/worker/common"
"github.com/iron-io/runner/common"
"golang.org/x/net/context"
)
@@ -24,7 +24,7 @@ func NewMetricLogger() *MetricLogger {
type MetricLogger struct{}
func (l *MetricLogger) Log(ctx context.Context, metric map[string]interface{}) {
log := titancommon.Logger(ctx)
log := common.Logger(ctx)
log.WithFields(logrus.Fields(metric)).Info()
}

15
api/runner/runner.go
View File

@@ -15,12 +15,11 @@ import (
"golang.org/x/net/context"
"github.com/Sirupsen/logrus"
"github.com/iron-io/worker/common"
"github.com/iron-io/worker/runner/agent"
"github.com/iron-io/worker/runner/drivers"
driverscommon "github.com/iron-io/worker/runner/drivers"
"github.com/iron-io/worker/runner/drivers/docker"
"github.com/iron-io/worker/runner/drivers/mock"
"github.com/iron-io/runner/common"
"github.com/iron-io/runner/drivers"
driverscommon "github.com/iron-io/runner/drivers"
"github.com/iron-io/runner/drivers/docker"
"github.com/iron-io/runner/drivers/mock"
)
type Config struct {
@@ -157,7 +156,7 @@ func (r *Runner) Run(ctx context.Context, cfg *Config) (drivers.RunResult, error
ctask := &containerTask{
ctx: ctx,
cfg: cfg,
auth: &agent.ConfigAuth{},
auth: &common.ConfigAuth{},
canRun: make(chan bool),
}
@@ -216,7 +215,7 @@ func (r *Runner) Run(ctx context.Context, cfg *Config) (drivers.RunResult, error
func (r Runner) EnsureImageExists(ctx context.Context, cfg *Config) error {
ctask := &containerTask{
cfg: cfg,
auth: &agent.ConfigAuth{},
auth: &common.ConfigAuth{},
}
err := r.driver.EnsureImageExists(ctx, ctask)

6
api/runner/task.go
View File

@@ -6,13 +6,13 @@ import (
"golang.org/x/net/context"
dockercli "github.com/fsouza/go-dockerclient"
"github.com/iron-io/worker/runner/drivers"
"github.com/iron-io/worker/runner/tasker"
"github.com/iron-io/runner/common"
"github.com/iron-io/runner/drivers"
)
type containerTask struct {
ctx context.Context
auth tasker.Auther
auth *common.ConfigAuth
cfg *Config
canRun chan bool
}