mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-13 11:57:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Streamline config, fix tests

Browse Source
This commit is contained in:
André Duffeck
2025-05-26 11:18:09 +02:00
parent f9d4a038b3
commit 33b7fa79f9
6 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/activitylog/pkg/config/config.go
View File

@@ -34,6 +34,7 @@ type Config struct {
Context context.Context `yaml:"-"`
WriteBufferDuration time.Duration `yaml:"write_buffer_duration" env:"ACTIVITYLOG_WRITE_BUFFER_DURATION" desc:"The duration to wait before flushing the write buffer. This is used to reduce the number of writes to the store." introductionVersion:"%%NEXT%%"`
MaxActivities int `yaml:"max_activities" env:"ACTIVITYLOG_MAX_ACTIVITIES" desc:"The maximum number of activities to keep in the store per resource. If the number of activities exceeds this value, the oldest activities will be removed." introductionVersion:"%%NEXT%%"`
}
// Events combines the configuration options for the event bus.

1
services/activitylog/pkg/config/defaults/defaultconfig.go
View File

@@ -53,6 +53,7 @@ func DefaultConfig() *config.Config {
},
},
WriteBufferDuration: 10 * time.Second,
MaxActivities: 6000,
}
}

1
services/activitylog/pkg/server/http/server.go
View File

@@ -88,7 +88,6 @@ func Server(opts ...Option) (http.Service, error) {
svc.HistoryClient(options.HistoryClient),
svc.ValueClient(options.ValueClient),
svc.RegisteredEvents(options.RegisteredEvents),
svc.WriteBufferDuration(options.Config.WriteBufferDuration),
)
if err != nil {
return http.Service{}, err

14
services/activitylog/pkg/service/options.go
View File

@@ -103,17 +103,3 @@ func ValueClient(vs settingssvc.ValueService) Option {
o.ValueClient = vs
}
}
// WriteBufferDuration sets the write buffer duration
func WriteBufferDuration(d time.Duration) Option {
return func(o *Options) {
o.WriteBufferDuration = d
}
}
// MaxActivities sets the maximum number of activities to store
func MaxActivities(max int) Option {
return func(o *Options) {
o.MaxActivities = max
}
}

4
services/activitylog/pkg/service/service.go
View File

@@ -206,10 +206,10 @@ func New(opts ...Option) (*ActivitylogService, error) {
tp: o.TraceProvider,
tracer: o.TraceProvider.Tracer("github.com/opencloud-eu/opencloud/services/activitylog/pkg/service"),
parentIdCache: cache,
maxActivities: o.MaxActivities,
maxActivities: o.Config.MaxActivities,
natskv: kv,
}
s.debouncer = NewDebouncer(o.WriteBufferDuration, s.storeActivity)
s.debouncer = NewDebouncer(o.Config.WriteBufferDuration, s.storeActivity)
s.mux.Get("/graph/v1beta1/extensions/org.libregraph/activities", s.HandleGetItemActivities)

16
services/activitylog/pkg/service/service_test.go
View File

@@ -66,7 +66,7 @@ var _ = SynchronizedAfterSuite(func() {
var _ = Describe("ActivitylogService", func() {
var (
alog *ActivitylogService
getResource func(ref *provider.Reference) (*provider.ResourceInfo, error)
getResource func(_ context.Context, ref *provider.Reference) (*provider.ResourceInfo, error)
writebufferduration = 100 * time.Millisecond
)
@@ -84,9 +84,9 @@ var _ = Describe("ActivitylogService", func() {
Nodes: []string{server.Addr().String()},
Database: "activitylog-test-" + uuid.New().String(),
},
MaxActivities: 4,
WriteBufferDuration: writebufferduration,
}),
MaxActivities(4),
WriteBufferDuration(writebufferduration),
Stream(stream),
TraceProvider(noop.NewTracerProvider()),
Mux(chi.NewMux()),
@@ -148,7 +148,7 @@ var _ = Describe("ActivitylogService", func() {
tc := tc // capture range variable
Context(tc.Name, func() {
JustBeforeEach(func() {
getResource = func(ref *provider.Reference) (*provider.ResourceInfo, error) {
getResource = func(_ context.Context, ref *provider.Reference) (*provider.ResourceInfo, error) {
return tc.Tree[ref.GetResourceId().GetOpaqueId()], nil
}
@@ -179,9 +179,13 @@ var _ = Describe("ActivitylogService", func() {
}
)
BeforeEach(func() {
writebufferduration = 100 * time.Millisecond
})
Describe("addActivity", func() {
var (
getResource = func(ref *provider.Reference) (*provider.ResourceInfo, error) {
getResource = func(_ context.Context, ref *provider.Reference) (*provider.ResourceInfo, error) {
return tree[ref.GetResourceId().GetOpaqueId()], nil
}
)
@@ -234,7 +238,7 @@ var _ = Describe("ActivitylogService", func() {
Describe("Activities", func() {
It("combines multiple batches", func() {
getResource = func(ref *provider.Reference) (*provider.ResourceInfo, error) {
getResource = func(_ context.Context, ref *provider.Reference) (*provider.ResourceInfo, error) {
return tree[ref.GetResourceId().GetOpaqueId()], nil
}