conform service design/usage patterns
This commit is contained in:
parent
89a5fdc4e5
commit
fd3b2a0dba
13 changed files with 65 additions and 60 deletions
22
main.go
22
main.go
|
|
@ -92,7 +92,7 @@ func main() {
|
|||
app.DB = psqlDB
|
||||
|
||||
logRepo := logRepo.NewLogRepositoryPostgres(psqlDB)
|
||||
app.Log = logService.NewLogService(
|
||||
app.LogService = logService.NewLogService(
|
||||
logRepo,
|
||||
log.New(os.Stderr, "logger", model.DEFAULT_LOG_FLAGS),
|
||||
)
|
||||
|
|
@ -139,7 +139,7 @@ func main() {
|
|||
logger.Fatalf("FATAL: Failed to create TOTP method: %v\n", err)
|
||||
}
|
||||
|
||||
app.Log.Info(model.LOG_ACCOUNT, "TOTP method \"%s\" for \"%s\" created via config utility.", totp.Name, account.Username)
|
||||
app.LogService.Info(model.LOG_ACCOUNT, "TOTP method \"%s\" for \"%s\" created via config utility.", totp.Name, account.Username)
|
||||
url := controller.GenerateTOTPURI(account.Username, totp.Secret)
|
||||
logger.Printf("%s\n", url)
|
||||
return
|
||||
|
|
@ -165,7 +165,7 @@ func main() {
|
|||
logger.Fatalf("FATAL: Failed to create TOTP method: %v\n", err)
|
||||
}
|
||||
|
||||
app.Log.Info(model.LOG_ACCOUNT, "TOTP method \"%s\" for \"%s\" deleted via config utility.", totpName, account.Username)
|
||||
app.LogService.Info(model.LOG_ACCOUNT, "TOTP method \"%s\" for \"%s\" deleted via config utility.", totpName, account.Username)
|
||||
logger.Printf("TOTP method \"%s\" deleted.\n", totpName)
|
||||
return
|
||||
|
||||
|
|
@ -231,7 +231,7 @@ func main() {
|
|||
if err != nil {
|
||||
logger.Fatalf("FATAL: Failed to clean up TOTP methods: %v\n", err)
|
||||
}
|
||||
app.Log.Info(model.LOG_ACCOUNT, "TOTP methods pruned via config utility.")
|
||||
app.LogService.Info(model.LOG_ACCOUNT, "TOTP methods pruned via config utility.")
|
||||
logger.Printf("Cleaned up dangling TOTP methods successfully.\n")
|
||||
return
|
||||
|
||||
|
|
@ -242,7 +242,7 @@ func main() {
|
|||
logger.Fatalf("FATAL: Failed to create invite code: %v\n", err)
|
||||
}
|
||||
|
||||
app.Log.Info(model.LOG_ACCOUNT, "Invite generted via config utility (%s).", invite.Code)
|
||||
app.LogService.Info(model.LOG_ACCOUNT, "Invite generted via config utility (%s).", invite.Code)
|
||||
logger.Printf(
|
||||
"Here you go! This code expires in %d hours: %s\n",
|
||||
int(math.Ceil(invite.ExpiresAt.Sub(invite.CreatedAt).Hours())),
|
||||
|
|
@ -257,7 +257,7 @@ func main() {
|
|||
logger.Fatalf("FATAL: Failed to delete invites: %v\n", err)
|
||||
}
|
||||
|
||||
app.Log.Info(model.LOG_ACCOUNT, "Invites purged via config utility.")
|
||||
app.LogService.Info(model.LOG_ACCOUNT, "Invites purged via config utility.")
|
||||
logger.Printf("Invites deleted successfully.\n")
|
||||
return
|
||||
|
||||
|
|
@ -310,7 +310,7 @@ func main() {
|
|||
logger.Fatalf("FATAL: Failed to update password: %v\n", err)
|
||||
}
|
||||
|
||||
app.Log.Info(model.LOG_ACCOUNT, "Password for '%s' updated via config utility.", account.Username)
|
||||
app.LogService.Info(model.LOG_ACCOUNT, "Password for '%s' updated via config utility.", account.Username)
|
||||
logger.Printf("Password for \"%s\" updated successfully.\n", account.Username)
|
||||
return
|
||||
|
||||
|
|
@ -342,7 +342,7 @@ func main() {
|
|||
logger.Fatalf("FATAL: Failed to delete account: %v\n", err)
|
||||
}
|
||||
|
||||
app.Log.Info(model.LOG_ACCOUNT, "Account '%s' deleted via config utility.", account.Username)
|
||||
app.LogService.Info(model.LOG_ACCOUNT, "Account '%s' deleted via config utility.", account.Username)
|
||||
logger.Printf("Account \"%s\" deleted successfully.\n", account.Username)
|
||||
return
|
||||
|
||||
|
|
@ -367,7 +367,7 @@ func main() {
|
|||
logger.Fatalf("FATAL: Failed to lock account: %v\n", err)
|
||||
}
|
||||
|
||||
app.Log.Info(model.LOG_ACCOUNT, "Account '%s' locked via config utility.", account.Username)
|
||||
app.LogService.Info(model.LOG_ACCOUNT, "Account '%s' locked via config utility.", account.Username)
|
||||
logger.Printf("Account \"%s\" locked successfully.\n", account.Username)
|
||||
return
|
||||
|
||||
|
|
@ -392,13 +392,13 @@ func main() {
|
|||
logger.Fatalf("FATAL: Failed to unlock account: %v\n", err)
|
||||
}
|
||||
|
||||
app.Log.Info(model.LOG_ACCOUNT, "Account '%s' unlocked via config utility.", account.Username)
|
||||
app.LogService.Info(model.LOG_ACCOUNT, "Account '%s' unlocked via config utility.", account.Username)
|
||||
logger.Printf("Account \"%s\" unlocked successfully.\n", account.Username)
|
||||
return
|
||||
|
||||
case "logs":
|
||||
// TODO: add log search parameters
|
||||
logs, err := app.Log.Search([]model.LogLevel{}, []string{}, "", 100, 0)
|
||||
logs, err := app.LogService.Search([]model.LogLevel{}, []string{}, "", 100, 0)
|
||||
if err != nil {
|
||||
logger.Fatalf("FATAL: Failed to fetch logs: %v\n", err)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue