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

restructure runtime code

Browse Source
This commit is contained in:
A.Unger
2020-06-04 11:45:19 +02:00
parent c7310ae232
commit c61bbd7783
6 changed files with 179 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/command/root.go
+1 -1
View File
@@ -7,8 +7,8 @@ import (
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/pkg/config"
"github.com/owncloud/ocis/pkg/flagset"
"github.com/owncloud/ocis/pkg/micro/runtime"
"github.com/owncloud/ocis/pkg/register"
"github.com/owncloud/ocis/pkg/runtime"
"github.com/owncloud/ocis/pkg/version"
)
pkg/command/server.go
+1 -1
View File
@@ -8,8 +8,8 @@ import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/pkg/config"
"github.com/owncloud/ocis/pkg/flagset"
"github.com/owncloud/ocis/pkg/micro/runtime"
"github.com/owncloud/ocis/pkg/register"
"github.com/owncloud/ocis/pkg/runtime"
"github.com/owncloud/ocis/pkg/tracing"
)
pkg/command/server_simple.go
+2 -11
View File
@@ -6,11 +6,10 @@ import (
"strings"
"github.com/micro/cli/v2"
"github.com/micro/go-micro/v2/config/cmd"
"github.com/owncloud/ocis/pkg/config"
"github.com/owncloud/ocis/pkg/flagset"
"github.com/owncloud/ocis/pkg/micro/runtime"
"github.com/owncloud/ocis/pkg/register"
"github.com/owncloud/ocis/pkg/runtime"
"github.com/owncloud/ocis/pkg/tracing"
)
@@ -39,19 +38,11 @@ func Simple(cfg *config.Config) *cli.Command {
return nil
},
Action: func(c *cli.Context) error {
logger := NewLogger(cfg)
if err := tracing.Start(cfg); err != nil {
return err
}
runtime := runtime.New(
runtime.Logger(logger),
runtime.Services(append(runtime.MicroServices, SimpleRuntimeServices...)),
runtime.MicroRuntime(cmd.DefaultCmd.Options().Runtime),
runtime.Context(c),
)
runtime := runtime.New()
runtime.Start()
return nil