add thumbnails

ocis/pkg/runtime/runtime.go

@@ -13,6 +13,7 @@ import (
 	proxy "github.com/owncloud/ocis/proxy/pkg/command"
 	settings "github.com/owncloud/ocis/settings/pkg/command"
 	store "github.com/owncloud/ocis/store/pkg/command"
+	thumbnails "github.com/owncloud/ocis/thumbnails/pkg/command"
 
 	"github.com/thejerf/suture"
 
@@ -38,13 +39,13 @@ var (
 
 	// Extensions are oCIS extension services
 	Extensions = []string{
-		"glauth",     // done
-		"idp",        // done
-		"ocs",        // done
-		"onlyoffice", // done
-		"proxy",      // done
-		"settings",   // done
-		"store",
+		"glauth",           // done
+		"idp",              // done
+		"ocs",              // done
+		"onlyoffice",       // done
+		"proxy",            // done
+		"settings",         // done
+		"store",            // done
 		"storage-metadata", // done
 		"storage-frontend",
 		"storage-gateway",
@@ -55,7 +56,7 @@ var (
 		"storage-home",
 		"storage-users",
 		"storage-public-link",
-		"thumbnails",
+		"thumbnails", // done
 		"web",
 		"webdav",
 	}
@@ -109,6 +110,7 @@ func (r *Runtime) Start() error {
 	// - establish on suture a max number of retries before all initialization comes to a halt.
 	// -  remove default log flagset values.
 	// - subcommands MUST also set MICRO_LOG_LEVEL to error.
+	// - 2021-03-04T14:06:37+01:00 FTL failed to read config error="open /Users/aunger/.ocis/idp.env: no such file or directory" service=idp still exists
 
 	// propagate reva log config to storage services
 	r.c.Storage.Log.Level = r.c.Log.Level
@@ -124,6 +126,7 @@ func (r *Runtime) Start() error {
 	addServiceToken("onlyoffice", supervisor.Add(onlyoffice.NewSutureService(globalCtx, r.c.Onlyoffice)))
 	addServiceToken("proxy", supervisor.Add(proxy.NewSutureService(globalCtx, r.c.Proxy)))
 	addServiceToken("store", supervisor.Add(store.NewSutureService(globalCtx, r.c.Store)))
+	addServiceToken("thumbnails", supervisor.Add(thumbnails.NewSutureService(globalCtx, r.c.Thumbnails)))
 
 	// TODO(refs) debug line with supervised services.
 	go supervisor.ServeBackground()

thumbnails/cmd/thumbnails/main.go

@@ -4,10 +4,11 @@ import (
 	"os"
 
 	"github.com/owncloud/ocis/thumbnails/pkg/command"
+	"github.com/owncloud/ocis/thumbnails/pkg/config"
 )
 
 func main() {
-	if err := command.Execute(); err != nil {
+	if err := command.Execute(config.New()); err != nil {
 		os.Exit(1)
 	}
 }

thumbnails/pkg/command/root.go

@@ -1,6 +1,7 @@
 package command
 
 import (
+	"context"
 	"os"
 	"strings"
 
@@ -13,9 +14,7 @@ import (
 )
 
 // Execute is the entry point for the ocis-thumbnails command.
-func Execute() error {
-	cfg := config.New()
-
+func Execute(cfg *config.Config) error {
 	app := &cli.App{
 		Name:     "ocis-thumbnails",
 		Version:  version.String,
@@ -108,3 +107,31 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 
 	return nil
 }
+
+// SutureService allows for the thumbnails command to be embedded and supervised by a suture supervisor tree.
+type SutureService struct {
+	ctx    context.Context
+	cancel context.CancelFunc // used to cancel the context go-micro services used to shutdown a service.
+	cfg    *config.Config
+}
+
+// NewSutureService creates a new thumbnails.SutureService
+func NewSutureService(ctx context.Context, cfg *config.Config) SutureService {
+	sctx, cancel := context.WithCancel(ctx)
+	cfg.Context = sctx // propagate the context down to the go-micro services.
+	return SutureService{
+		ctx:    sctx,
+		cancel: cancel,
+		cfg:    cfg,
+	}
+}
+
+func (s SutureService) Serve() {
+	if err := Execute(s.cfg); err != nil {
+		return
+	}
+}
+
+func (s SutureService) Stop() {
+	s.cancel()
+}

thumbnails/pkg/config/config.go

@@ -1,5 +1,7 @@
 package config
 
+import "context"
+
 // Log defines the available logging configuration.
 type Log struct {
 	Level  string
@@ -40,6 +42,8 @@ type Config struct {
 	Server    Server
 	Tracing   Tracing
 	Thumbnail Thumbnail
+
+	Context context.Context
 }
 
 // FileSystemStorage defines the available filesystem storage configuration.

thumbnails/pkg/flagset/flagset.go

@@ -13,23 +13,20 @@ func RootWithConfig(cfg *config.Config) []cli.Flag {
 	return []cli.Flag{
 		&cli.StringFlag{
 			Name:        "log-level",
-			Value:       "info",
 			Usage:       "Set logging level",
-			EnvVars:     []string{"THUMBNAILS_LOG_LEVEL"},
+			EnvVars:     []string{"THUMBNAILS_LOG_LEVEL", "OCIS_LOG_LEVEL"},
 			Destination: &cfg.Log.Level,
 		},
 		&cli.BoolFlag{
 			Name:        "log-pretty",
-			Value:       true,
 			Usage:       "Enable pretty logging",
-			EnvVars:     []string{"THUMBNAILS_LOG_PRETTY"},
+			EnvVars:     []string{"THUMBNAILS_LOG_PRETTY", "OCIS_LOG_PRETTY"},
 			Destination: &cfg.Log.Pretty,
 		},
 		&cli.BoolFlag{
 			Name:        "log-color",
-			Value:       true,
 			Usage:       "Enable colored logging",
-			EnvVars:     []string{"THUMBNAILS_LOG_COLOR"},
+			EnvVars:     []string{"THUMBNAILS_LOG_COLOR", "OCIS_LOG_COLOR"},
 			Destination: &cfg.Log.Color,
 		},
 	}