albert/cml04-falcon-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
aespin 2024-10-04 11:51:55 +02:00
parent a8bb3b99b7
commit 15f43604fa
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/injector.go
View File

@ -19,7 +19,7 @@ var injectorCmd = &cobra.Command{
func init() { func init() {
rootCmd.AddCommand(injectorCmd) rootCmd.AddCommand(injectorCmd)
injectorCmd.Flags().String("http-addr", ":9443", "nats.io broker host address") injectorCmd.Flags().String("http-addr", ":3000", "nats.io broker host address")
injectorCmd.Flags().String("nats-host", "nats", "nats.io broker host address") injectorCmd.Flags().String("nats-host", "nats", "nats.io broker host address")
injectorCmd.Flags().Int("nats-port", 4222, "nats.io broker tcp port") injectorCmd.Flags().Int("nats-port", 4222, "nats.io broker tcp port")
injectorCmd.Flags().String("log-level", "debug", "log level trace") injectorCmd.Flags().String("log-level", "debug", "log level trace")

8
injector/app/app.go
View File

@ -7,6 +7,7 @@ import (
"syscall" "syscall"
"git.espin.casa/albert/cml04-falcon-system/injector/logging" "git.espin.casa/albert/cml04-falcon-system/injector/logging"
"git.espin.casa/albert/cml04-falcon-system/injector/server"
"git.espin.casa/albert/cml04-falcon-system/injector/service" "git.espin.casa/albert/cml04-falcon-system/injector/service"
"git.espin.casa/albert/cml04-falcon-system/internal/publisher" "git.espin.casa/albert/cml04-falcon-system/internal/publisher"
"git.espin.casa/albert/logger" "git.espin.casa/albert/logger"
@ -41,6 +42,13 @@ func Run(cmd *cobra.Command, args []string) {
// create service // create service
svc := service.New(pub) svc := service.New(pub)
svc = logging.New(log, svc) svc = logging.New(log, svc)
// create http server
server := server.New(httpAddr, svc)
// start http server
if err := server.Start(); err != nil {
log.Error("create start http server failed", err, logFields)
return
}
// info banner // info banner
log.Info("started cml04-falcon-handset service", logFields) log.Info("started cml04-falcon-handset service", logFields)
// wait signal to finish // wait signal to finish

6
injector/logging/logging.go
View File

@ -19,12 +19,12 @@ func (l *LoggingService) Bundle(ctx context.Context, req *types.PostBundleReq) (
defer func(start time.Time) { defer func(start time.Time) {
logFields := logger.LogFields{ logFields := logger.LogFields{
"took": time.Since(start), "took": time.Since(start),
"bundle_id": res.BundleData.Nromatricula, "bundle_id": req.BundleData.Nromatricula,
} }
if err != nil { if err != nil {
l.log.Error("get product tolerance data failed", err, logFields) l.log.Error("post bundle data failed", err, logFields)
} else { } else {
l.log.Info("get product tolerance data success", logFields) l.log.Info("post bundle data success", logFields)
} }
}(time.Now()) }(time.Now())
return l.next.Bundle(ctx, req) return l.next.Bundle(ctx, req)

4
injector/server/server.go
View File

@ -82,11 +82,11 @@ func (s *Server) Start() error {
return nil return nil
} }
func NewServer(url string, svc service.IService) *Server { func New(url string, svc service.IService) *Server {
// create new swag // create new swag
api := swag.New( api := swag.New(
option.Title("CELSA 4 Falcon Bundle Injector"), option.Title("CELSA 4 Falcon Bundle Injector"),
option.Description("This is an implementation of a REST API server for mediciones"), option.Description("This is an implementation of a REST API server for falcon bundle management"),
option.ContactEmail("aespin@gcelsa.com"), option.ContactEmail("aespin@gcelsa.com"),
option.Version("1.0"), option.Version("1.0"),
option.BasePath("/api/v1"), option.BasePath("/api/v1"),

8
internal/types/bundle.go
View File

@ -82,10 +82,10 @@ func (b *BundleData) BeforeSave(tx *gorm.DB) error {
if err := DesvioReal(b); err != nil { if err := DesvioReal(b); err != nil {
return err return err
} }
// calculation of the deviation between theorical and SAP // // calculation of the deviation between theorical and SAP
if err := PesoDesvioSAP(b); err != nil { // if err := PesoDesvioSAP(b); err != nil {
return err // return err
} // }
return nil return nil
} }