working commit

This commit is contained in:
2026-06-10 17:44:45 +02:00
parent a53197e432
commit 2c8c20b12b
9 changed files with 9 additions and 84 deletions
+1 -1
View File
@@ -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
}
+1 -1
View File
@@ -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
}
+1 -1
View File
@@ -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,
+1 -1
View File
@@ -22,7 +22,7 @@ type Database struct {
func NewDatabase(datapath string) *Database {
return &Database{
datapath: datapath,
logg: logger.NewLoggerWithSubject("maindb"),
logg: logger.NewLogger("maindb"),
}
}
+1 -1
View File
@@ -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
}
+1 -1
View File
@@ -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
}
+1 -1
View File
@@ -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
}
+2 -2
View File
@@ -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 {
-75
View File
@@ -1,75 +0,0 @@
/*
* Copyright 2026 Oleg Borodin <onborodin@gmail.com>
*/
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()
}