mirror/opencloud
1
0 Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-10-24 15:19:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Work with pointers instead of copying sync.Mutex

Browse Source
This commit is contained in:
Benedikt Kulmann committed 2020-07-01 15:42:30 +02:00
1 parent 7bbbcc126f
commit e38f0a491c
1 file changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files
pkg/service/v0/service.go
+8 -8
View File
@@ -120,14 +120,14 @@ func New(opts ...Option) (s *Service, err error) {
// TODO groups
for i := range accounts {
var bytes []byte
if bytes, err = json.Marshal(accounts[i]); err != nil {
logger.Error().Err(err).Interface("account", accounts[i]).Msg("could not marshal default account")
if bytes, err = json.Marshal(&accounts[i]); err != nil {
logger.Error().Err(err).Interface("account", &accounts[i]).Msg("could not marshal default account")
return
}
path := filepath.Join(accountsDir, accounts[i].Id)
if err = ioutil.WriteFile(path, bytes, 0600); err != nil {
accounts[i].PasswordProfile.Password = "***REMOVED***"
logger.Error().Err(err).Str("path", path).Interface("account", accounts[i]).Msg("could not persist default account")
logger.Error().Err(err).Str("path", path).Interface("account", &accounts[i]).Msg("could not persist default account")
return
}
}
@@ -172,9 +172,9 @@ func New(opts ...Option) (s *Service, err error) {
logger.Error().Err(err).Str("path", path).Msg("could not unmarshal account")
continue
}
logger.Debug().Interface("account", a).Msg("found account")
if err = s.index.Index(a.Id, a); err != nil {
logger.Error().Err(err).Str("path", path).Interface("account", a).Msg("could not index account")
logger.Debug().Interface("account", &a).Msg("found account")
if err = s.index.Index(a.Id, &a); err != nil {
logger.Error().Err(err).Str("path", path).Interface("account", &a).Msg("could not index account")
continue
}
}
@@ -262,11 +262,11 @@ func (s Service) ListAccounts(ctx context.Context, in *proto.ListAccountsRequest
s.log.Error().Err(err).Str("path", path).Msg("could not unmarshal account")
continue
}
s.log.Debug().Interface("account", a).Msg("found account")
s.log.Debug().Interface("account", &a).Msg("found account")
if password != "" {
if a.PasswordProfile == nil {
s.log.Debug().Interface("account", a).Msg("no password profile")
s.log.Debug().Interface("account", &a).Msg("no password profile")
return fmt.Errorf("invalid password")
}
if !s.passwordIsValid(a.PasswordProfile.Password, password) {