bump reva

Signed-off-by: jkoberg <jkoberg@owncloud.com>
This commit is contained in:
jkoberg
2023-07-31 15:54:46 +02:00
parent c6abbf6f60
commit 2afcb84186
6 changed files with 33 additions and 10 deletions
@@ -39,6 +39,7 @@ import (
"github.com/cs3org/reva/v2/pkg/utils"
"github.com/juliangruber/go-intersect"
"github.com/mitchellh/mapstructure"
"github.com/rs/zerolog/log"
"google.golang.org/grpc"
)
@@ -47,8 +48,10 @@ func init() {
}
type service struct {
provider app.Provider
conf *config
provider app.Provider
conf *config
context context.Context
cancelFunc context.CancelFunc
}
type config struct {
@@ -58,12 +61,16 @@ type config struct {
GatewaySvc string `mapstructure:"gatewaysvc"`
MimeTypes []string `mapstructure:"mime_types"`
Priority uint64 `mapstructure:"priority"`
RefreshTime time.Duration `mapstructure:"refreshtime"`
}
func (c *config) init() {
if c.Driver == "" {
c.Driver = "demo"
}
if c.RefreshTime < 1 {
c.RefreshTime = time.Second * 20
}
c.AppProviderURL = sharedconf.GetGatewaySVC(c.AppProviderURL)
c.GatewaySvc = sharedconf.GetGatewaySVC(c.GatewaySvc)
}
@@ -89,14 +96,28 @@ func New(m map[string]interface{}, ss *grpc.Server) (rgrpc.Service, error) {
return nil, err
}
ctx, cancelFunc := context.WithCancel(context.Background())
service := &service{
conf: c,
provider: provider,
conf: c,
provider: provider,
context: ctx,
cancelFunc: cancelFunc,
}
t := time.NewTicker(c.RefreshTime)
go func() {
// TODO: implement me to call service.registerProvider with a ticker
service.registerProvider()
for {
select {
case <-t.C:
log.Debug().Msg("app provider tick, registering Provider")
service.registerProvider()
case <-service.context.Done():
log.Debug().Msg("app provider stopped")
t.Stop()
}
}
}()
return service, nil
}
@@ -76,6 +76,7 @@ type CapabilitiesCore struct {
WebdavRoot string `json:"webdav-root,omitempty" xml:"webdav-root,omitempty" mapstructure:"webdav_root"`
Status *Status `json:"status" xml:"status"`
SupportURLSigning ocsBool `json:"support-url-signing" xml:"support-url-signing" mapstructure:"support_url_signing"`
SupportSSE ocsBool `json:"support-sse" xml:"support-sse" mapstructure:"support_sse"`
}
// CapabilitiesGraph holds the graph capabilities