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

refactor checks for activitylog and antivirus

Browse Source 
Signed-off-by: Christian Richter <crichter@owncloud.com>
This commit is contained in:
Christian Richter
2024-10-10 11:12:41 +02:00
parent c86cc619c2
commit 7d1a78cf9c
2 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/activitylog/pkg/server/debug/server.go
View File

@@ -1,11 +1,8 @@
package debug
import (
"context"
"fmt"
"net/http"
"github.com/cs3org/reva/v2/pkg/events/stream"
"github.com/owncloud/ocis/v2/ocis-pkg/handlers"
"github.com/owncloud/ocis/v2/ocis-pkg/service/debug"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
@@ -17,13 +14,8 @@ func Server(opts ...Option) (*http.Server, error) {
checkHandler := handlers.NewCheckHandler(
handlers.NewCheckHandlerConfiguration().
WithLogger(options.Logger).WithCheck("nats reachability", func(ctx context.Context) error {
_, err := stream.NatsFromConfig("healthcheckfornats", false, stream.NatsConfig(options.Config.Events))
if err != nil {
return fmt.Errorf("could not connect to nats server: %v", err)
}
return nil
}),
WithLogger(options.Logger).
WithCheck("nats reachability", handlers.NewNatsCheck(options.Config.Events.Cluster)),
)
return debug.NewService(

28
services/antivirus/pkg/server/debug/server.go
View File

@@ -2,15 +2,12 @@ package debug
import (
"context"
"fmt"
"net"
"net/http"
"github.com/cs3org/reva/v2/pkg/events/stream"
"github.com/dutchcoders/go-clamd"
"github.com/owncloud/ocis/v2/ocis-pkg/handlers"
"github.com/owncloud/ocis/v2/ocis-pkg/service/debug"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/owncloud/ocis/v2/services/antivirus/pkg/scanners"
)
// Server initializes the debug service and server.
@@ -20,31 +17,18 @@ func Server(opts ...Option) (*http.Server, error) {
checkHandler := handlers.NewCheckHandler(
handlers.NewCheckHandlerConfiguration().
WithLogger(options.Logger).
WithCheck("nats reachability", func(ctx context.Context) error {
_, err := stream.NatsFromConfig("healthcheckfornats", false, stream.NatsConfig(options.Config.Events))
if err != nil {
return fmt.Errorf("could not connect to nats server: %v", err)
}
return nil
}).
WithCheck("nats reachability", handlers.NewNatsCheck(options.Config.Events.Cluster)).
WithCheck("antivirus reachability", func(ctx context.Context) error {
cfg := options.Config
switch cfg.Scanner.Type {
default:
// there is not av configured, return no error here
return nil
// there is not av configured, so we panic
panic("no antivirus configured")
case "clamav":
_, err := net.Dial("tcp", cfg.Scanner.ClamAV.Socket)
if err != nil {
return fmt.Errorf("could not connect to clamav server: %v", err)
}
return clamd.NewClamd(cfg.Scanner.ClamAV.Socket).Ping()
case "icap":
_, err := scanners.NewICAP(cfg.Scanner.ICAP.URL, cfg.Scanner.ICAP.Service, cfg.Scanner.ICAP.Timeout)
if err != nil {
return fmt.Errorf("could not connect to icap server: %v", err)
}
return handlers.NewTCPCheck(cfg.Scanner.ICAP.URL)(ctx)
}
return nil
}),
)