From da16bdeee891a77bb0a00b869f534c72c7d05be0 Mon Sep 17 00:00:00 2001 From: "Alex Ellis (OpenFaaS Ltd)" Date: Tue, 24 Dec 2019 09:58:24 +0000 Subject: [PATCH] Extract services to method Signed-off-by: Alex Ellis (OpenFaaS Ltd) --- cmd/up.go | 55 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/cmd/up.go b/cmd/up.go index fc41204..877724d 100644 --- a/cmd/up.go +++ b/cmd/up.go @@ -18,8 +18,37 @@ var upCmd = &cobra.Command{ func runUp(_ *cobra.Command, _ []string) error { + services := makeServiceDefinitions() + + start := time.Now() + supervisor, err := pkg.NewSupervisor("/run/containerd/containerd.sock") + if err != nil { + return err + } + + log.Printf("Supervisor created in: %s\n", time.Since(start).String()) + + start = time.Now() + + err = supervisor.Start(services) + + if err != nil { + return err + } + + defer supervisor.Close() + + log.Printf("Supervisor init done in: %s\n", time.Since(start).String()) + + time.Sleep(time.Minute * 120) + + return nil +} + +func makeServiceDefinitions() []pkg.Service { wd, _ := os.Getwd() - svcs := []pkg.Service{ + + return []pkg.Service{ pkg.Service{ Name: "nats", Env: []string{""}, @@ -71,28 +100,4 @@ func runUp(_ *cobra.Command, _ []string) error { Caps: []string{"CAP_NET_RAW"}, }, } - - start := time.Now() - supervisor, err := pkg.NewSupervisor("/run/containerd/containerd.sock") - if err != nil { - return err - } - - log.Printf("Supervisor created in: %s\n", time.Since(start).String()) - - start = time.Now() - - err = supervisor.Start(svcs) - - if err != nil { - return err - } - - defer supervisor.Close() - - log.Printf("Supervisor init done in: %s\n", time.Since(start).String()) - - time.Sleep(time.Minute * 120) - - return nil }