rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace "errorx".First => "errors".Join

Browse source
This commit is contained in:
Tom Wiesing 2023-05-10 13:36:08 +02:00
parent bbbd1240eb
commit 3a893bbfb6
No known key found for this signature in database
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/server.go
View file

@ -1,6 +1,7 @@
package cmd
import (
"errors"
"net"
"net/http"
@ -8,7 +9,6 @@ import (
"github.com/FAU-CDI/wisski-distillery/internal/cli"
"github.com/rs/zerolog"
"github.com/tkw1536/goprogram/exit"
"github.com/tkw1536/pkglib/errorx"
)
// Server is the 'server' command
@ -105,11 +105,11 @@ func (s server) Run(context wisski_distillery.Context) error {
go func() {
<-context.Context.Done()
zerolog.Ctx(context.Context).Info().Msg("shutting down server")
publicS.Shutdown(context.Context)
internalS.Shutdown(context.Context)
}()
return errServerListen.Wrap(errorx.First(<-internalC, <-publicC, err))
return errServerListen.Wrap(errors.Join(<-internalC, <-publicC, err))
}

3
internal/dis/component/sql/provision.go
View file

@ -5,7 +5,6 @@ import (
"errors"
"github.com/FAU-CDI/wisski-distillery/internal/models"
"github.com/tkw1536/pkglib/errorx"
"github.com/tkw1536/pkglib/sqlx"
)
@ -19,7 +18,7 @@ func (sql *SQL) Provision(ctx context.Context, instance models.Instance, domain
// Purge purges sql-specific resources for the given instance
func (sql *SQL) Purge(ctx context.Context, instance models.Instance, domain string) error {
return errorx.First(
return errors.Join(
sql.PurgeDatabase(instance.SqlDatabase),
sql.PurgeUser(ctx, instance.SqlUsername),
)

4
internal/dis/component/triplestore/provision.go
View file

@ -3,6 +3,7 @@ package triplestore
import (
"bytes"
"context"
"errors"
"net/http"
_ "embed"
@ -10,7 +11,6 @@ import (
"github.com/FAU-CDI/wisski-distillery/internal/models"
"github.com/FAU-CDI/wisski-distillery/pkg/unpack"
"github.com/tkw1536/goprogram/exit"
"github.com/tkw1536/pkglib/errorx"
)
var errTripleStoreFailedRepository = exit.Error{
@ -26,7 +26,7 @@ func (ts *Triplestore) Provision(ctx context.Context, instance models.Instance,
}
func (ts *Triplestore) Purge(ctx context.Context, instance models.Instance, domain string) error {
return errorx.First(
return errors.Join(
ts.PurgeRepo(ctx, instance.GraphDBRepository),
ts.PurgeUser(ctx, instance.GraphDBUsername),
)