Merge pull request #1066 from owncloud/runtime-cleanup

owncloud · Dec 11, 2020 · 0dfdcd7 · 0dfdcd7
2 parents ea2a2b3 + 7bba6bc
commit 0dfdcd7
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 13 deletions.
diff --git a/accounts/pkg/command/root.go b/accounts/pkg/command/root.go
@@ -97,7 +97,7 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	if err := viper.ReadInConfig(); err != nil {
 		switch err.(type) {
 		case viper.ConfigFileNotFoundError:
-			logger.Info().
+			logger.Debug().
 				Msg("no config found on preconfigured location")
 		case viper.UnsupportedConfigError:
 			logger.Fatal().

diff --git a/changelog/unreleased/runtime-cleanup.md b/changelog/unreleased/runtime-cleanup.md
@@ -0,0 +1,5 @@
+Enhancement: Runtime Cleanup
+
+Small runtime cleanup prior to Tech Preview release
+
+https://github.com/owncloud/ocis/pull/1066
diff --git a/glauth/pkg/command/root.go b/glauth/pkg/command/root.go
@@ -86,7 +86,7 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	if err := viper.ReadInConfig(); err != nil {
 		switch err.(type) {
 		case viper.ConfigFileNotFoundError:
-			logger.Info().
+			logger.Debug().
 				Msg("no config found on preconfigured location")
 		case viper.UnsupportedConfigError:
 			logger.Fatal().

diff --git a/konnectd/pkg/command/root.go b/konnectd/pkg/command/root.go
@@ -87,7 +87,7 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	if err := viper.ReadInConfig(); err != nil {
 		switch err.(type) {
 		case viper.ConfigFileNotFoundError:
-			logger.Info().
+			logger.Debug().
 				Msg("no config found on preconfigured location")
 		case viper.UnsupportedConfigError:
 			logger.Fatal().

diff --git a/ocis-phoenix/pkg/command/root.go b/ocis-phoenix/pkg/command/root.go
@@ -81,7 +81,7 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	if err := viper.ReadInConfig(); err != nil {
 		switch err.(type) {
 		case viper.ConfigFileNotFoundError:
-			logger.Info().
+			logger.Debug().
 				Msg("no config found on preconfigured location")
 		case viper.UnsupportedConfigError:
 			logger.Fatal().

diff --git a/ocis/pkg/command/root.go b/ocis/pkg/command/root.go
@@ -101,7 +101,7 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	if err := viper.ReadInConfig(); err != nil {
 		switch err.(type) {
 		case viper.ConfigFileNotFoundError:
-			logger.Info().
+			logger.Debug().
 				Msg("no config found on preconfigured location")
 		case viper.UnsupportedConfigError:
 			logger.Fatal().

diff --git a/ocis/pkg/runtime/runtime.go b/ocis/pkg/runtime/runtime.go
@@ -34,8 +34,6 @@ var (
 	// Extensions are ocis extension services
 	Extensions = []string{
 		"glauth",
-		"graph",
-		"graph-explorer",
 		"konnectd",
 		"ocs",
 		"onlyoffice",
@@ -54,6 +52,8 @@ var (
 		"storage-public-link",
 		"thumbnails",
 		"webdav",
+		//"graph",
+		//"graph-explorer",
 	}
 
 	// There seem to be a race condition when reva-sharing needs to read the sharing.json file and the parent folder is not present.
@@ -129,6 +129,11 @@ OUT:
 func RunService(client *rpc.Client, service string) int {
 	args := process.NewProcEntry(service, os.Environ(), []string{service}...)
 
+	all := append(Extensions, append(dependants, MicroServices...)...)
+	if !contains(all, service) {
+		return 1
+	}
+
 	var reply int
 	if err := client.Call("Service.Start", args, &reply); err != nil {
 		golog.Fatal(err)
@@ -159,3 +164,12 @@ func setDefaults() {
 	// registry
 	registry.Name = OwncloudNamespace + "registry"
 }
+
+func contains(a []string, b string) bool {
+	for i := range a {
+		if a[i] == b {
+			return true
+		}
+	}
+	return false
+}
diff --git a/ocs/pkg/command/root.go b/ocs/pkg/command/root.go
@@ -87,7 +87,7 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	if err := viper.ReadInConfig(); err != nil {
 		switch err.(type) {
 		case viper.ConfigFileNotFoundError:
-			logger.Info().
+			logger.Debug().
 				Msg("no config found on preconfigured location")
 		case viper.UnsupportedConfigError:
 			logger.Fatal().

diff --git a/settings/pkg/command/root.go b/settings/pkg/command/root.go
@@ -87,7 +87,7 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	if err := viper.ReadInConfig(); err != nil {
 		switch err.(type) {
 		case viper.ConfigFileNotFoundError:
-			logger.Info().
+			logger.Debug().
 				Msg("no config found on preconfigured location")
 		case viper.UnsupportedConfigError:
 			logger.Fatal().

diff --git a/storage/pkg/command/root.go b/storage/pkg/command/root.go
@@ -51,7 +51,7 @@ func Execute() error {
 			if err := viper.ReadInConfig(); err != nil {
 				switch err.(type) {
 				case viper.ConfigFileNotFoundError:
-					logger.Info().
+					logger.Debug().
 						Msg("no config found on preconfigured location")
 				case viper.UnsupportedConfigError:
 					logger.Fatal().

diff --git a/store/pkg/command/root.go b/store/pkg/command/root.go
@@ -87,7 +87,7 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	if err := viper.ReadInConfig(); err != nil {
 		switch err.(type) {
 		case viper.ConfigFileNotFoundError:
-			logger.Info().
+			logger.Debug().
 				Msg("no config found on preconfigured location")
 		case viper.UnsupportedConfigError:
 			logger.Fatal().

diff --git a/thumbnails/pkg/command/root.go b/thumbnails/pkg/command/root.go
@@ -87,7 +87,7 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	if err := viper.ReadInConfig(); err != nil {
 		switch err.(type) {
 		case viper.ConfigFileNotFoundError:
-			logger.Info().
+			logger.Debug().
 				Msg("no config found on preconfigured location")
 		case viper.UnsupportedConfigError:
 			logger.Fatal().

diff --git a/webdav/pkg/command/root.go b/webdav/pkg/command/root.go
@@ -86,7 +86,7 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	if err := viper.ReadInConfig(); err != nil {
 		switch err.(type) {
 		case viper.ConfigFileNotFoundError:
-			logger.Info().
+			logger.Debug().
 				Msg("no config found on preconfigured location")
 		case viper.UnsupportedConfigError:
 			logger.Fatal().