diff --git a/app/accoper/operator.go b/app/accoper/operator.go index db1a5bb..1899086 100644 --- a/app/accoper/operator.go +++ b/app/accoper/operator.go @@ -22,6 +22,6 @@ func NewOperator(params *OperatorParams) (*Operator, error) { oper := &Operator{ mdb: params.MainDB, } - oper.logg = logger.NewLoggerWithSubject("imageoper") + oper.logg = logger.NewLogger("imageoper") return oper, err } diff --git a/app/handler/handler.go b/app/handler/handler.go index de94eff..32fe3b4 100644 --- a/app/handler/handler.go +++ b/app/handler/handler.go @@ -34,7 +34,7 @@ func NewHandler(params *HandlerParams) (*Handler, error) { acop: params.AccOper, seop: params.ServOper, } - hand.logg = logger.NewLoggerWithSubject("handler") + hand.logg = logger.NewLogger("handler") return hand, err } diff --git a/app/logger/logger.go b/app/logger/logger.go index a025f4c..18e6f7d 100644 --- a/app/logger/logger.go +++ b/app/logger/logger.go @@ -23,7 +23,7 @@ type Logger struct { mtx *sync.Mutex } -func NewLoggerWithSubject(subj string) *Logger { +func NewLogger(subj string) *Logger { return &Logger{ subject: subj, writer: output, diff --git a/app/maindb/maindb.go b/app/maindb/maindb.go index 7d2a5d1..d3a19d8 100644 --- a/app/maindb/maindb.go +++ b/app/maindb/maindb.go @@ -22,7 +22,7 @@ type Database struct { func NewDatabase(datapath string) *Database { return &Database{ datapath: datapath, - logg: logger.NewLoggerWithSubject("maindb"), + logg: logger.NewLogger("maindb"), } } diff --git a/app/server/server.go b/app/server/server.go index e26e75d..84d2ed0 100644 --- a/app/server/server.go +++ b/app/server/server.go @@ -55,7 +55,7 @@ type Server struct { func NewServer() (*Server, error) { var err error srv := &Server{} - srv.logg = logger.NewLoggerWithSubject("server") + srv.logg = logger.NewLogger("server") srv.ctx, srv.cancel = context.WithCancel(context.Background()) return srv, err } diff --git a/app/service/service.go b/app/service/service.go index 7aaba1e..0348702 100644 --- a/app/service/service.go +++ b/app/service/service.go @@ -33,7 +33,7 @@ func NewService(params *ServiceParams) (*Service, error) { hand: params.Handler, listen: params.Listener, } - svc.logg = logger.NewLoggerWithSubject("service") + svc.logg = logger.NewLogger("service") return svc, err } diff --git a/app/servoper/operator.go b/app/servoper/operator.go index 9ed10c5..12d6f32 100644 --- a/app/servoper/operator.go +++ b/app/servoper/operator.go @@ -22,6 +22,6 @@ func NewOperator(params *OperatorParams) (*Operator, error) { oper := &Operator{ mdb: params.MainDB, } - oper.logg = logger.NewLoggerWithSubject("servoper") + oper.logg = logger.NewLogger("servoper") return oper, err } diff --git a/cmd/mbased/main.go b/cmd/mbased/main.go index 885ff31..1fa747b 100644 --- a/cmd/mbased/main.go +++ b/cmd/mbased/main.go @@ -25,13 +25,13 @@ import ( "os" "mbase/app/logger" - "mbase/cmd/mbased/starter" + "mbase/app/starter" _ "mbase/app/handler" ) func main() { - log := logger.NewLoggerWithSubject("main") + log := logger.NewLogger("main") sta := starter.NewStarter() err := sta.Exec() if err != nil { diff --git a/cmd/mbased/starter/starter.go b/cmd/mbased/starter/starter.go deleted file mode 100644 index 19223e6..0000000 --- a/cmd/mbased/starter/starter.go +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2026 Oleg Borodin - */ -package starter - -import ( - "os" - "path/filepath" - - "mbase/app/server" - - "github.com/spf13/cobra" -) - -type Starter struct { - runAsDaemon bool - port uint32 - cmd *cobra.Command - srv *server.Server -} - -func NewStarter() *Starter { - execName := filepath.Base(os.Args[0]) - sta := &Starter{} - cmd := &cobra.Command{ - Use: execName, - Short: "\nArtifact storage service", - SilenceUsage: true, - RunE: sta.run, - } - cmd.CompletionOptions.DisableDefaultCmd = true - cmd.Flags().BoolVarP(&sta.runAsDaemon, "asDaemon", "D", true, "Run service as daemon") - cmd.Flags().Uint32VarP(&sta.port, "port", "P", 1025, "Service port") - - sta.cmd = cmd - return sta -} - -func (sta *Starter) GetCmd() *cobra.Command { - return sta.cmd -} - -func (sta *Starter) run(cmd *cobra.Command, args []string) error { - var err error - srv, err := server.NewServer() - if err != nil { - return err - } - err = srv.Configure() - if err != nil { - return err - } - srv.SetAsDaemon(sta.runAsDaemon) - srv.SetPort(sta.port) - - err = srv.Daemonize() - if err != nil { - return err - } - - err = srv.Build() - if err != nil { - return err - } - err = srv.Run() - if err != nil { - return err - } - sta.srv = srv - return err -} - -func (sta *Starter) Exec() error { - return sta.cmd.Execute() -}