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

allow user configured agent in full node (#627)

Browse Source 
* allow user configured agent in full node

this should keep the old default behavior but allow users to pass in a
configured agent to configure the server themselves, without having to worry
about a russian agent being a british agent.

also closes any agent given to an api node.

closes #623

* don't close agent in runner test
This commit is contained in:
Reed Allman
2017-12-26 11:04:14 -06:00
committed by GitHub
parent 3c686aac5c
commit 683fef8c2e
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/server/server.go
View File

@@ -204,6 +204,10 @@ func New(ctx context.Context, opts ...ServerOption) *Server {
switch s.nodeType { switch s.nodeType {
case ServerTypeAPI: case ServerTypeAPI:
if s.agent != nil {
logrus.Info("shutting down agent configured for api node")
s.agent.Close()
}
s.agent = nil s.agent = nil
case ServerTypeRunner: case ServerTypeRunner:
if s.agent == nil { if s.agent == nil {
@@ -215,10 +219,12 @@ func New(ctx context.Context, opts ...ServerOption) *Server {
logrus.Fatal("Full nodes must configure FN_DB_URL, FN_LOG_URL, FN_MQ_URL.") logrus.Fatal("Full nodes must configure FN_DB_URL, FN_LOG_URL, FN_MQ_URL.")
} }
// TODO force caller to use WithAgent option ? // TODO force caller to use WithAgent option? at this point we need to use the ds/ls/mq configured after all opts are run.
if s.agent == nil {
// TODO for tests we don't want cache, really, if we force WithAgent this can be fixed. cache needs to be moved anyway so that runner nodes can use it... // TODO for tests we don't want cache, really, if we force WithAgent this can be fixed. cache needs to be moved anyway so that runner nodes can use it...
s.agent = agent.New(agent.NewCachedDataAccess(agent.NewDirectDataAccess(s.datastore, s.logstore, s.mq))) s.agent = agent.New(agent.NewCachedDataAccess(agent.NewDirectDataAccess(s.datastore, s.logstore, s.mq)))
} }
}
setMachineID() setMachineID()
s.Router.Use(loggerWrap, traceWrap, panicWrap) // TODO should be opts s.Router.Use(loggerWrap, traceWrap, panicWrap) // TODO should be opts

2
api/server/server_test.go
View File

@@ -168,7 +168,7 @@ func TestRunnerNode(t *testing.T) {
// Add route with an API server using the same DB // Add route with an API server using the same DB
{ {
apiServer := testServer(ds, &mqs.Mock{}, logDB, rnr, ServerTypeAPI) apiServer := testServer(ds, &mqs.Mock{}, logDB, nil, ServerTypeAPI)
_, rec := routerRequest(t, apiServer.Router, "POST", "/v1/apps/myapp/routes", bytes.NewBuffer([]byte(`{ "route": { "name": "myroute", "path": "/myroute", "image": "fnproject/hello", "type": "sync" } }`))) _, rec := routerRequest(t, apiServer.Router, "POST", "/v1/apps/myapp/routes", bytes.NewBuffer([]byte(`{ "route": { "name": "myroute", "path": "/myroute", "image": "fnproject/hello", "type": "sync" } }`)))
if rec.Code != http.StatusOK { if rec.Code != http.StatusOK {
t.Errorf("Expected status code 200 when creating sync route, but got %d", rec.Code) t.Errorf("Expected status code 200 when creating sync route, but got %d", rec.Code)