3
0

fix(all): fix Init function, required as-is

This commit is contained in:
Tit Petric
2019-03-15 01:50:58 +01:00
parent 22e88c1698
commit 0ab9cc71da
6 changed files with 24 additions and 11 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ var (
DefaultAttachment AttachmentService
)
func init() {
func Init() {
o.Do(func() {
fs, err := store.New("var/store")
if err != nil {
+7 -2
View File
@@ -11,11 +11,12 @@ import (
"github.com/titpetric/factory/resputil"
migrate "github.com/crusttech/crust/crm/db"
"github.com/crusttech/crust/internal/db"
"github.com/crusttech/crust/crm/internal/service"
"github.com/crusttech/crust/internal/auth"
"github.com/crusttech/crust/internal/db"
"github.com/crusttech/crust/internal/mail"
"github.com/crusttech/crust/internal/metrics"
systemService "github.com/crusttech/crust/system/service"
)
var (
@@ -51,6 +52,10 @@ func Init() error {
},
})
// Don't change this, it needs Database
systemService.Init()
service.Init()
return nil
}
+1 -1
View File
@@ -24,7 +24,7 @@ var (
DefaultPermissions PermissionsService
)
func init() {
func Init() {
o.Do(func() {
fs, err := store.New("var/store")
if err != nil {
+8 -3
View File
@@ -10,12 +10,13 @@ import (
"github.com/pkg/errors"
"github.com/titpetric/factory/resputil"
"github.com/crusttech/crust/internal/db"
migrate "github.com/crusttech/crust/messaging/db"
"github.com/crusttech/crust/internal/auth"
"github.com/crusttech/crust/internal/db"
"github.com/crusttech/crust/internal/mail"
"github.com/crusttech/crust/internal/metrics"
migrate "github.com/crusttech/crust/messaging/db"
"github.com/crusttech/crust/messaging/internal/service"
systemService "github.com/crusttech/crust/system/service"
)
var (
@@ -51,6 +52,10 @@ func Init() error {
},
})
// Don't change this, it needs Database
systemService.Init()
service.Init()
return nil
}
+1 -1
View File
@@ -21,7 +21,7 @@ var (
DefaultPermissions PermissionsService
)
func init() {
func Init() {
o.Do(func() {
DefaultRules = Rules()
DefaultPermissions = Permissions()
+6 -3
View File
@@ -10,12 +10,12 @@ import (
"github.com/pkg/errors"
"github.com/titpetric/factory/resputil"
"github.com/crusttech/crust/internal/db"
migrate "github.com/crusttech/crust/system/db"
"github.com/crusttech/crust/internal/auth"
"github.com/crusttech/crust/internal/db"
"github.com/crusttech/crust/internal/mail"
"github.com/crusttech/crust/internal/metrics"
migrate "github.com/crusttech/crust/system/db"
"github.com/crusttech/crust/system/service"
)
var (
@@ -51,6 +51,9 @@ func Init() error {
},
})
// Don't change this, it needs Database
service.Init()
return nil
}