working commit

2026-01-26 18:36:30 +02:00
parent 15e4e893b1
commit 6db319088e
19 changed files with 621 additions and 95 deletions
@@ -12,19 +12,21 @@ import (
 	"syscall"
 	//"time"

-	"mstore/app/database"
+	"mstore/app/config"
 	"mstore/app/handler"
 	"mstore/app/logger"
+	"mstore/app/maindb"
 	"mstore/app/operator"
 	"mstore/app/service"
 )

 type Server struct {
-	oper *operator.Operator
-	svc  *service.Service
-	db   *database.Database
-	hand *handler.Handler
-	logg *logger.Logger
+	conf   *config.Config
+	oper   *operator.Operator
+	svc    *service.Service
+	maindb *maindb.Database
+	hand   *handler.Handler
+	logg   *logger.Logger
 }

 func NewServer() (*Server, error) {
@@ -41,21 +43,38 @@ func (srv *Server) Handler() *handler.Handler {
 func (srv *Server) Configure() error {
 	var err error
 	srv.logg.Infof("Server configure")
+	srv.conf, err = config.NewConfig()
+	if err != nil {
+		return err
+	}
+
 	return err
 }

 func (srv *Server) Build() error {
 	var err error
 	srv.logg.Infof("Server build")
+
 	// Database create
-	databaseParams := &database.DatabaseParams{}
-	srv.db, err = database.NewDatabase(databaseParams)
+	dbdir := srv.conf.Database.Basepath
+	err = os.MkdirAll(srv.conf.Database.Basepath, 0750)
 	if err != nil {
 		return err
 	}
+
+	maindb := maindb.NewDatabase(dbdir)
+	err = maindb.OpenDatabase()
+	if err != nil {
+		return err
+	}
+	err = maindb.InitDatabase()
+	if err != nil {
+		return err
+	}
+
 	// Operator create
 	operatorParams := &operator.OperatorParams{
-		Database: srv.db,
+		MainDB: srv.maindb,
 	}
 	srv.oper, err = operator.NewOperator(operatorParams)
 	if err != nil {