From 15f43604fa3ef0dc61efb041197c5a452db3d124 Mon Sep 17 00:00:00 2001 From: aespin Date: Fri, 4 Oct 2024 11:51:55 +0200 Subject: [PATCH] wip --- cmd/injector.go | 2 +- injector/app/app.go | 8 ++++++++ injector/logging/logging.go | 6 +++--- injector/server/server.go | 4 ++-- internal/types/bundle.go | 8 ++++---- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/cmd/injector.go b/cmd/injector.go index c48f8ef..20b922b 100644 --- a/cmd/injector.go +++ b/cmd/injector.go @@ -19,7 +19,7 @@ var injectorCmd = &cobra.Command{ func init() { 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().Int("nats-port", 4222, "nats.io broker tcp port") injectorCmd.Flags().String("log-level", "debug", "log level trace") diff --git a/injector/app/app.go b/injector/app/app.go index ad61cc8..042f016 100644 --- a/injector/app/app.go +++ b/injector/app/app.go @@ -7,6 +7,7 @@ import ( "syscall" "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/internal/publisher" "git.espin.casa/albert/logger" @@ -41,6 +42,13 @@ func Run(cmd *cobra.Command, args []string) { // create service svc := service.New(pub) 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 log.Info("started cml04-falcon-handset service", logFields) // wait signal to finish diff --git a/injector/logging/logging.go b/injector/logging/logging.go index bf26556..45b77e9 100644 --- a/injector/logging/logging.go +++ b/injector/logging/logging.go @@ -19,12 +19,12 @@ func (l *LoggingService) Bundle(ctx context.Context, req *types.PostBundleReq) ( defer func(start time.Time) { logFields := logger.LogFields{ "took": time.Since(start), - "bundle_id": res.BundleData.Nromatricula, + "bundle_id": req.BundleData.Nromatricula, } if err != nil { - l.log.Error("get product tolerance data failed", err, logFields) + l.log.Error("post bundle data failed", err, logFields) } else { - l.log.Info("get product tolerance data success", logFields) + l.log.Info("post bundle data success", logFields) } }(time.Now()) return l.next.Bundle(ctx, req) diff --git a/injector/server/server.go b/injector/server/server.go index 99f7874..9195239 100644 --- a/injector/server/server.go +++ b/injector/server/server.go @@ -82,11 +82,11 @@ func (s *Server) Start() error { return nil } -func NewServer(url string, svc service.IService) *Server { +func New(url string, svc service.IService) *Server { // create new swag api := swag.New( 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.Version("1.0"), option.BasePath("/api/v1"), diff --git a/internal/types/bundle.go b/internal/types/bundle.go index dce5ef8..9c39c5e 100644 --- a/internal/types/bundle.go +++ b/internal/types/bundle.go @@ -82,10 +82,10 @@ func (b *BundleData) BeforeSave(tx *gorm.DB) error { if err := DesvioReal(b); err != nil { return err } - // calculation of the deviation between theorical and SAP - if err := PesoDesvioSAP(b); err != nil { - return err - } + // // calculation of the deviation between theorical and SAP + // if err := PesoDesvioSAP(b); err != nil { + // return err + // } return nil }