3
0

upd(system): error messages, service init cleanup

This commit is contained in:
Tit Petric
2019-04-03 14:26:11 +02:00
parent ac4ec2570a
commit 3966ba695c
2 changed files with 19 additions and 16 deletions
+10 -1
View File
@@ -1,9 +1,18 @@
package service
type (
serviceError string
serviceError string
readableError string
)
func (e serviceError) Error() string {
return "crust.messaging.service." + string(e)
}
func (e readableError) Error() string {
return string(e)
}
const (
ErrAvatarOnlyHTTPS readableError = "Avatar URL only supports HTTPS"
)
+9 -15
View File
@@ -1,9 +1,5 @@
package service
import (
"sync"
)
type (
db interface {
Transaction(callback func() error) error
@@ -11,7 +7,6 @@ type (
)
var (
o sync.Once
DefaultAuth AuthService
DefaultUser UserService
DefaultRole RoleService
@@ -21,14 +16,13 @@ var (
DefaultPermissions PermissionsService
)
func Init() {
o.Do(func() {
DefaultRules = Rules()
DefaultPermissions = Permissions()
DefaultAuth = Auth()
DefaultUser = User()
DefaultRole = Role()
DefaultOrganisation = Organisation()
DefaultApplication = Application()
})
func Init() error {
DefaultRules = Rules()
DefaultPermissions = Permissions()
DefaultAuth = Auth()
DefaultUser = User()
DefaultRole = Role()
DefaultOrganisation = Organisation()
DefaultApplication = Application()
return nil
}