From 9155d034c5e6acf662b113158f0b845220b6344a Mon Sep 17 00:00:00 2001 From: Erich Kaestner <36450093+jdknives@users.noreply.github.com> Date: Fri, 23 Oct 2020 12:53:38 +0300 Subject: [PATCH 1/3] fix service disc value --- pkg/prepconf/prepare.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/prepconf/prepare.go b/pkg/prepconf/prepare.go index f4c83840..07c05fa6 100644 --- a/pkg/prepconf/prepare.go +++ b/pkg/prepconf/prepare.go @@ -120,7 +120,7 @@ func generateVisorConfig(_ Config, bp boot.Params) (interface{}, error) { out.ShutdownTimeout = visorconfig.DefaultTimeout out.RestartCheckDelay = restart.DefaultCheckDelay.String() out.Launcher = &visorconfig.V1Launcher{ - Discovery: nil, + Discovery: &visorconfig.V1AppDisc{ServiceDisc: skyenv.DefaultServiceDiscAddr, UpdateInterval: visorconfig.Duration(skyenv.AppDiscUpdateInterval)}, Apps: []launcher.AppConfig{ { Name: skyenv.SkychatName, From 6b1c38146874f99f3786436c219fb5e27dfe33c0 Mon Sep 17 00:00:00 2001 From: Erich Kaestner <36450093+jdknives@users.noreply.github.com> Date: Fri, 23 Oct 2020 12:56:11 +0300 Subject: [PATCH 2/3] format --- pkg/prepconf/prepare.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/prepconf/prepare.go b/pkg/prepconf/prepare.go index 07c05fa6..591f2517 100644 --- a/pkg/prepconf/prepare.go +++ b/pkg/prepconf/prepare.go @@ -120,7 +120,9 @@ func generateVisorConfig(_ Config, bp boot.Params) (interface{}, error) { out.ShutdownTimeout = visorconfig.DefaultTimeout out.RestartCheckDelay = restart.DefaultCheckDelay.String() out.Launcher = &visorconfig.V1Launcher{ - Discovery: &visorconfig.V1AppDisc{ServiceDisc: skyenv.DefaultServiceDiscAddr, UpdateInterval: visorconfig.Duration(skyenv.AppDiscUpdateInterval)}, + Discovery: &visorconfig.V1AppDisc{ + ServiceDisc: skyenv.DefaultServiceDiscAddr, + UpdateInterval: visorconfig.Duration(skyenv.AppDiscUpdateInterval)}, Apps: []launcher.AppConfig{ { Name: skyenv.SkychatName, From 8204bbe6546be7dd929776d0d5921e8dfa79a485 Mon Sep 17 00:00:00 2001 From: Nikita Kryuchkov Date: Fri, 23 Oct 2020 12:59:01 +0300 Subject: [PATCH 3/3] Fix struct formatting --- pkg/prepconf/prepare.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/prepconf/prepare.go b/pkg/prepconf/prepare.go index 591f2517..0404cc99 100644 --- a/pkg/prepconf/prepare.go +++ b/pkg/prepconf/prepare.go @@ -122,7 +122,8 @@ func generateVisorConfig(_ Config, bp boot.Params) (interface{}, error) { out.Launcher = &visorconfig.V1Launcher{ Discovery: &visorconfig.V1AppDisc{ ServiceDisc: skyenv.DefaultServiceDiscAddr, - UpdateInterval: visorconfig.Duration(skyenv.AppDiscUpdateInterval)}, + UpdateInterval: visorconfig.Duration(skyenv.AppDiscUpdateInterval), + }, Apps: []launcher.AppConfig{ { Name: skyenv.SkychatName,