get rid of unused AccountsDataPath

This commit is contained in:
Willy Kloucek
2020-12-11 08:33:02 +01:00
parent 469b093fe8
commit 84e0d70323
5 changed files with 4 additions and 16 deletions

View File

@@ -40,10 +40,9 @@ type GRPC struct {
// Server configures a server.
type Server struct {
Version string
Name string
AccountsDataPath string
HashDifficulty int
Version string
Name string
HashDifficulty int
}
// Asset defines the available asset configuration.

View File

@@ -119,13 +119,6 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
EnvVars: []string{"ACCOUNTS_NAME"},
Destination: &cfg.Server.Name,
},
&cli.StringFlag{
Name: "accounts-data-path",
Value: "/var/tmp/ocis-accounts",
Usage: "accounts folder",
EnvVars: []string{"ACCOUNTS_DATA_PATH"},
Destination: &cfg.Server.AccountsDataPath,
},
&cli.IntFlag{
Name: "accounts-hash-difficulty",
Value: 11,

View File

@@ -78,7 +78,6 @@ func init() {
)
cfg := config.New()
cfg.Server.AccountsDataPath = dataPath
cfg.Repo.Disk.Path = dataPath
var hdlr *svc.Service
var err error

View File

@@ -33,7 +33,6 @@ var (
func init() {
cfg := config.New()
cfg.Server.Name = "accounts"
cfg.Server.AccountsDataPath = dataPath
cfg.Repo.Disk.Path = dataPath
logger := olog.NewLogger(olog.Color(true), olog.Pretty(true))
roleServiceMock = buildRoleServiceMock()

View File

@@ -3,7 +3,6 @@ package service
import (
"context"
"path"
"path/filepath"
"strconv"
"github.com/gofrs/uuid"
@@ -182,7 +181,6 @@ func (s Service) DeleteGroup(c context.Context, in *proto.DeleteGroupRequest, ou
if id, err = cleanupID(in.Id); err != nil {
return merrors.InternalServerError(s.id, "could not clean up group id: %v", err.Error())
}
path := filepath.Join(s.Config.Server.AccountsDataPath, "groups", id)
g := &proto.Group{}
if err = s.repo.LoadGroup(c, id, g); err != nil {
@@ -212,7 +210,7 @@ func (s Service) DeleteGroup(c context.Context, in *proto.DeleteGroupRequest, ou
}
if err = s.index.Delete(g); err != nil {
s.log.Error().Err(err).Str("id", id).Str("path", path).Msg("could not remove group from index")
s.log.Error().Err(err).Str("id", id).Msg("could not remove group from index")
return merrors.InternalServerError(s.id, "could not remove group from index: %v", err.Error())
}