mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-06 04:09:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #617 from owncloud/thumbnails-version-command

Browse Source 
add version command and add build information to metrics
This commit is contained in:
Michael Barz
2020-09-29 22:11:41 +02:00
committed by GitHub
parent 7d1c026b90 c05b5a3a81
commit 1e9535afd1
12 changed files with 103 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ocis/pkg/command/thumbnails.go
View File

@@ -4,6 +4,7 @@ package command
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis/pkg/version"
"github.com/owncloud/ocis/thumbnails/pkg/command"
"github.com/owncloud/ocis/thumbnails/pkg/flagset"
"github.com/owncloud/ocis/ocis/pkg/config"
@@ -19,6 +20,9 @@ func ThumbnailsCommand(cfg *config.Config) *cli.Command {
Usage: "Start thumbnails server",
Category: "Extensions",
Flags: flagset.ServerWithConfig(cfg.Thumbnails),
Subcommands: []*cli.Command{
command.PrintVersion(cfg.Thumbnails),
},
Action: func(c *cli.Context) error {
thumbnailsCommand := command.Server(configureThumbnails(cfg))
@@ -35,6 +39,7 @@ func configureThumbnails(cfg *config.Config) *svcconfig.Config {
cfg.Thumbnails.Log.Level = cfg.Log.Level
cfg.Thumbnails.Log.Pretty = cfg.Log.Pretty
cfg.Thumbnails.Log.Color = cfg.Log.Color
cfg.Thumbnails.Server.Version = version.String
if cfg.Tracing.Enabled {
cfg.Thumbnails.Tracing.Enabled = cfg.Tracing.Enabled