mirrors/homebox
1
0
Fork 0
mirror of https://github.com/sysadminsmedia/homebox.git synced 2025-12-24 14:31:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

switch to zero log

Browse Source
This commit is contained in:
Hayden
2022-09-03 10:38:35 -08:00
parent 9351b3fd42
commit 68204a4f22
26 changed files with 122 additions and 1335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
backend/app/api/seed.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/hay-kot/content/backend/internal/repo"
"github.com/hay-kot/content/backend/internal/types"
"github.com/hay-kot/content/backend/pkgs/hasher"
"github.com/hay-kot/content/backend/pkgs/logger"
"github.com/rs/zerolog/log"
)
const (
@@ -23,7 +23,7 @@ func (a *app) EnsureAdministrator() {
superusers, err := a.repos.Users.GetSuperusers(context.Background())
if err != nil {
a.logger.Fatal(err, nil)
log.Fatal().Err(err).Msg("failed to get superusers")
}
if len(superusers) > 0 {
return
@@ -37,15 +37,15 @@ func (a *app) EnsureAdministrator() {
Password: pw,
}
a.logger.Info("creating default superuser", logger.Props{
"name": newSuperUser.Name,
"email": newSuperUser.Email,
})
log.Info().
Str("name", newSuperUser.Name).
Str("email", newSuperUser.Email).
Msg("no superusers found, creating default superuser")
_, err = a.repos.Users.Create(context.Background(), newSuperUser)
if err != nil {
a.logger.Fatal(err, nil)
log.Fatal().Err(err).Msg("failed to create default superuser")
}
}
@@ -57,7 +57,7 @@ func (a *app) SeedDatabase(repos *repo.AllRepos) {
group, err := repos.Groups.Create(context.Background(), DefaultGroup)
if err != nil {
a.logger.Fatal(err, nil)
log.Fatal().Err(err).Msg("failed to create default group")
}
for _, user := range a.conf.Seed.Users {
@@ -66,19 +66,13 @@ func (a *app) SeedDatabase(repos *repo.AllRepos) {
usr, _ := repos.Users.GetOneEmail(context.Background(), user.Email)
if usr.ID != uuid.Nil {
a.logger.Info("seed user already exists", logger.Props{
"user": user.Name,
})
log.Info().Str("email", user.Email).Msg("user already exists, skipping")
continue
}
hashedPw, err := hasher.HashPassword(user.Password)
if err != nil {
a.logger.Error(err, logger.Props{
"details": "failed to hash password",
"user": user.Name,
})
log.Fatal().Err(err).Msg("failed to hash password")
}
_, err = repos.Users.Create(context.Background(), types.UserCreate{
@@ -90,14 +84,9 @@ func (a *app) SeedDatabase(repos *repo.AllRepos) {
})
if err != nil {
a.logger.Error(err, logger.Props{
"details": "failed to create seed user",
"name": user.Name,
})
log.Fatal().Err(err).Msg("failed to create user")
}
a.logger.Info("creating seed user", logger.Props{
"name": user.Name,
})
log.Info().Str("email", user.Email).Msg("created user")
}
}