From faae82aa1ccfbcaa202d134e2876bc9b44763d6a Mon Sep 17 00:00:00 2001 From: "Alex Ellis (OpenFaaS Ltd)" Date: Fri, 18 Sep 2020 12:17:19 +0100 Subject: [PATCH] Move core services logs to the journal Logs can now be viewed with the following, adding -f to follow the logs. journalctl -t default:gateway Signed-off-by: Alex Ellis (OpenFaaS Ltd) --- docker-compose.yaml | 4 ++-- pkg/provider/handlers/deploy.go | 1 - pkg/supervisor.go | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 9a6deefd..44057559 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -26,8 +26,8 @@ services: - "8222" - "--store=memory" - "--cluster_id=faas-cluster" - ports: - - "127.0.0.1:8222:8222" + # ports: + # - "127.0.0.1:8222:8222" prometheus: image: docker.io/prom/prometheus:v2.14.0 diff --git a/pkg/provider/handlers/deploy.go b/pkg/provider/handlers/deploy.go index 0eee4cc5..098031ef 100644 --- a/pkg/provider/handlers/deploy.go +++ b/pkg/provider/handlers/deploy.go @@ -128,7 +128,6 @@ func deploy(ctx context.Context, req types.FunctionDeployment, client *container func createTask(ctx context.Context, client *containerd.Client, container containerd.Container, cni gocni.CNI) error { name := container.ID() - // task, taskErr := container.NewTask(ctx, cio.NewCreator(cio.WithStdio)) task, taskErr := container.NewTask(ctx, cio.BinaryIO("/usr/local/bin/faasd", nil)) diff --git a/pkg/supervisor.go b/pkg/supervisor.go index 5977f3f3..e2695a64 100644 --- a/pkg/supervisor.go +++ b/pkg/supervisor.go @@ -180,10 +180,10 @@ func (s *Supervisor) Start(svcs []Service) error { log.Printf("Created container: %s\n", newContainer.ID()) - task, err := newContainer.NewTask(ctx, cio.NewCreator(cio.WithStdio)) - if err != nil { + task, taskErr := newContainer.NewTask(ctx, cio.BinaryIO("/usr/local/bin/faasd", nil)) + if taskErr != nil { log.Printf("Error creating task: %s\n", err) - return err + return taskErr } labels := map[string]string{}