wip
This commit is contained in:
A.Unger
+50
-56
@@ -1,25 +1,12 @@
|
||||
package runtime
|
||||
|
||||
import (
|
||||
"context"
|
||||
"os"
|
||||
"os/signal"
|
||||
|
||||
mzlog "github.com/asim/go-micro/plugins/logger/zerolog/v3"
|
||||
"github.com/asim/go-micro/v3/logger"
|
||||
accounts "github.com/owncloud/ocis/accounts/pkg/command"
|
||||
glauth "github.com/owncloud/ocis/glauth/pkg/command"
|
||||
idp "github.com/owncloud/ocis/idp/pkg/command"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
ocs "github.com/owncloud/ocis/ocs/pkg/command"
|
||||
onlyoffice "github.com/owncloud/ocis/onlyoffice/pkg/command"
|
||||
proxy "github.com/owncloud/ocis/proxy/pkg/command"
|
||||
settings "github.com/owncloud/ocis/settings/pkg/command"
|
||||
storage "github.com/owncloud/ocis/storage/pkg/command"
|
||||
store "github.com/owncloud/ocis/store/pkg/command"
|
||||
thumbnails "github.com/owncloud/ocis/thumbnails/pkg/command"
|
||||
web "github.com/owncloud/ocis/web/pkg/command"
|
||||
webdav "github.com/owncloud/ocis/webdav/pkg/command"
|
||||
"github.com/owncloud/ocis/ocis/pkg/runtime/service"
|
||||
"github.com/rs/zerolog"
|
||||
"github.com/thejerf/suture"
|
||||
)
|
||||
@@ -45,51 +32,58 @@ type serviceTokens map[string][]suture.ServiceToken
|
||||
var tokens = serviceTokens{}
|
||||
|
||||
// Start rpc runtime
|
||||
// TODO(refs) initialize a new Service struct
|
||||
// - run the set of default services under the server command.
|
||||
func (r *Runtime) Start() error {
|
||||
setMicroLogger(r.c.Log)
|
||||
halt := make(chan os.Signal, 1)
|
||||
signal.Notify(halt, os.Interrupt)
|
||||
// 1. create new Service struct
|
||||
// 2. start
|
||||
|
||||
supervisor := suture.NewSimple("ocis")
|
||||
globalCtx, globalCancel := context.WithCancel(context.Background())
|
||||
return service.Start(service.WithConfig(r.c))
|
||||
|
||||
// propagate reva log config to storage services
|
||||
inheritedOptions := []storage.Option{
|
||||
storage.WithLogPretty(r.c.Log.Pretty),
|
||||
storage.WithLogColor(r.c.Log.Color),
|
||||
storage.WithLogLevel(r.c.Log.Level),
|
||||
}
|
||||
|
||||
addServiceToken("settings", supervisor.Add(settings.NewSutureService(globalCtx, r.c.Settings)))
|
||||
addServiceToken("storage-metadata", supervisor.Add(storage.NewStorageMetadata(globalCtx, inheritedOptions...)))
|
||||
addServiceToken("accounts", supervisor.Add(accounts.NewSutureService(globalCtx, r.c.Accounts)))
|
||||
addServiceToken("glauth", supervisor.Add(glauth.NewSutureService(globalCtx, r.c.GLAuth)))
|
||||
addServiceToken("idp", supervisor.Add(idp.NewSutureService(globalCtx, r.c.IDP)))
|
||||
addServiceToken("ocs", supervisor.Add(ocs.NewSutureService(globalCtx, r.c.OCS)))
|
||||
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)))
|
||||
addServiceToken("web", supervisor.Add(web.NewSutureService(globalCtx, r.c.Web)))
|
||||
addServiceToken("webdav", supervisor.Add(webdav.NewSutureService(globalCtx, r.c.WebDAV)))
|
||||
addServiceToken("storage-frontend", supervisor.Add(storage.NewFrontend(globalCtx, inheritedOptions...)))
|
||||
addServiceToken("storage-gateway", supervisor.Add(storage.NewGateway(globalCtx, inheritedOptions...)))
|
||||
addServiceToken("storage-users", supervisor.Add(storage.NewUsersProviderService(globalCtx, inheritedOptions...)))
|
||||
addServiceToken("storage-groupsprovider", supervisor.Add(storage.NewGroupsProvider(globalCtx, inheritedOptions...))) // TODO(refs) panic? are we sending to a nil / closed channel?
|
||||
addServiceToken("storage-authbasic", supervisor.Add(storage.NewAuthBasic(globalCtx, inheritedOptions...)))
|
||||
addServiceToken("storage-authbearer", supervisor.Add(storage.NewAuthBearer(globalCtx, inheritedOptions...)))
|
||||
addServiceToken("storage-home", supervisor.Add(storage.NewStorageHome(globalCtx, inheritedOptions...)))
|
||||
addServiceToken("storage-users", supervisor.Add(storage.NewStorageUsers(globalCtx, inheritedOptions...)))
|
||||
addServiceToken("storage-public-link", supervisor.Add(storage.NewStoragePublicLink(globalCtx, inheritedOptions...)))
|
||||
addServiceToken("storage-sharing", supervisor.Add(storage.NewSharing(globalCtx, inheritedOptions...)))
|
||||
|
||||
// TODO(refs) debug line with supervised services.
|
||||
go supervisor.ServeBackground()
|
||||
|
||||
<-halt
|
||||
|
||||
globalCancel()
|
||||
close(halt)
|
||||
//setMicroLogger(r.c.Log)
|
||||
//halt := make(chan os.Signal, 1)
|
||||
//signal.Notify(halt, os.Interrupt)
|
||||
//
|
||||
//supervisor := suture.NewSimple("ocis")
|
||||
//globalCtx, globalCancel := context.WithCancel(context.Background())
|
||||
//
|
||||
//// propagate reva log config to storage services
|
||||
//inheritedOptions := []storage.Option{
|
||||
// storage.WithLogPretty(r.c.Log.Pretty),
|
||||
// storage.WithLogColor(r.c.Log.Color),
|
||||
// storage.WithLogLevel(r.c.Log.Level),
|
||||
//}
|
||||
//
|
||||
//addServiceToken("settings", supervisor.Add(settings.NewSutureService(globalCtx, r.c.Settings)))
|
||||
//addServiceToken("storage-metadata", supervisor.Add(storage.NewStorageMetadata(globalCtx, inheritedOptions...)))
|
||||
//addServiceToken("accounts", supervisor.Add(accounts.NewSutureService(globalCtx, r.c.Accounts)))
|
||||
//addServiceToken("glauth", supervisor.Add(glauth.NewSutureService(globalCtx, r.c.GLAuth)))
|
||||
//addServiceToken("idp", supervisor.Add(idp.NewSutureService(globalCtx, r.c.IDP)))
|
||||
//addServiceToken("ocs", supervisor.Add(ocs.NewSutureService(globalCtx, r.c.OCS)))
|
||||
//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)))
|
||||
//addServiceToken("web", supervisor.Add(web.NewSutureService(globalCtx, r.c.Web)))
|
||||
//addServiceToken("webdav", supervisor.Add(webdav.NewSutureService(globalCtx, r.c.WebDAV)))
|
||||
//addServiceToken("storage-frontend", supervisor.Add(storage.NewFrontend(globalCtx, inheritedOptions...)))
|
||||
//addServiceToken("storage-gateway", supervisor.Add(storage.NewGateway(globalCtx, inheritedOptions...)))
|
||||
//addServiceToken("storage-users", supervisor.Add(storage.NewUsersProviderService(globalCtx, inheritedOptions...)))
|
||||
//addServiceToken("storage-groupsprovider", supervisor.Add(storage.NewGroupsProvider(globalCtx, inheritedOptions...)))
|
||||
//addServiceToken("storage-authbasic", supervisor.Add(storage.NewAuthBasic(globalCtx, inheritedOptions...)))
|
||||
//addServiceToken("storage-authbearer", supervisor.Add(storage.NewAuthBearer(globalCtx, inheritedOptions...)))
|
||||
//addServiceToken("storage-home", supervisor.Add(storage.NewStorageHome(globalCtx, inheritedOptions...)))
|
||||
//addServiceToken("storage-users", supervisor.Add(storage.NewStorageUsers(globalCtx, inheritedOptions...)))
|
||||
//addServiceToken("storage-public-link", supervisor.Add(storage.NewStoragePublicLink(globalCtx, inheritedOptions...)))
|
||||
//addServiceToken("storage-sharing", supervisor.Add(storage.NewSharing(globalCtx, inheritedOptions...)))
|
||||
//
|
||||
//// TODO(refs) debug line with supervised services.
|
||||
//go supervisor.ServeBackground()
|
||||
//
|
||||
//<-halt
|
||||
//
|
||||
//globalCancel()
|
||||
//close(halt)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user