working commit

app/handler/handler.go

@@ -1,7 +1,7 @@
 package handler
 
 import (
-	"mbase/app/logic"
+	"mbase/app/operator"
 	"mbase/pkg/logger"
 	"mbase/pkg/mbctl"
 
@@ -9,12 +9,12 @@ import (
 )
 
 type HandlerConfig struct {
-	Logic *logic.Logic
+	Logic *operator.Logic
 }
 
 type Handler struct {
 	mbctl.UnimplementedControlServer
-	lg  *logic.Logic
+	lg  *operator.Logic
 	log *logger.Logger
 }
 

app/operator/account.go

@@ -1,4 +1,4 @@
-package logic
+package operator
 
 import (
 	"context"

app/operator/database.go

@@ -1,4 +1,4 @@
-package logic
+package operator
 
 import (
 	"context"

app/operator/dump.go

@@ -1,4 +1,4 @@
-package logic
+package operator
 
 import (
 	"context"

app/operator/grants.go

@@ -1,4 +1,4 @@
-package logic
+package operator
 
 import (
 	"context"

app/operator/hello.go

@@ -1,4 +1,4 @@
-package logic
+package operator
 
 import (
 	"context"

app/operator/logic.go

@@ -1,4 +1,4 @@
-package logic
+package operator
 
 import (
 	"sync/atomic"

app/server/server.go

@@ -13,7 +13,7 @@ import (
 	"mbase/app/config"
 	"mbase/app/maindb"
 	"mbase/pkg/descr"
-	"mbase/app/logic"
+	"mbase/app/operator"
 	"mbase/pkg/aux509"
 	"mbase/pkg/logger"
 	"mbase/pkg/netacl"
@@ -26,7 +26,7 @@ import (
 
 type Server struct {
 	conf *config.Config
-	lg   *logic.Logic
+	lg   *operator.Logic
 	svc  *service.Service
 	hand *handler.Handler
 	log  *logger.Logger
@@ -176,10 +176,10 @@ func (srv *Server) Build() error {
 		return err
 	}
 	// Create logic
-	logicConfig := &logic.LogicConfig{
+	logicConfig := &operator.LogicConfig{
 		Database: srv.db,
 	}
-	srv.lg, err = logic.NewLogic(logicConfig)
+	srv.lg, err = operator.NewLogic(logicConfig)
 	if err != nil {
 		return err
 	}

app/service/service.go

@@ -8,7 +8,7 @@ import (
 	"net"
 
 	"mbase/app/handler"
-	"mbase/app/logic"
+	"mbase/app/operator"
 	"mbase/pkg/logger"
 	"mbase/pkg/netacl"
 
@@ -20,7 +20,7 @@ import (
 
 type ServiceConfig struct {
 	Handler  *handler.Handler
-	Logic    *logic.Logic
+	Logic    *operator.Logic
 	NetACL   *netacl.NetACL
 	Portnum  uint32
 	Address  string
@@ -33,7 +33,7 @@ type ServiceConfig struct {
 type Service struct {
 	gsrv     *grpc.Server
 	hand     *handler.Handler
-	lg       *logic.Logic
+	lg       *operator.Logic
 	log      *logger.Logger
 	nacl     *netacl.NetACL
 	portnum  uint32