refactor: Update main.go to process Civial Aviation Authority Telegram messages and add CLI flag for Nats server address and topic

This commit is contained in:
windyboy
2024-08-05 10:58:20 +08:00
parent c54bcbc0a8
commit 3c917c93af
3 changed files with 49 additions and 23 deletions
+45 -19
View File
@@ -12,6 +12,10 @@ import (
"github.com/urfave/cli/v2"
)
var (
cfg *config.Config
)
func main() {
app := setupApp()
if err := app.Run(os.Args); err != nil {
@@ -21,26 +25,10 @@ func main() {
func setupApp() *cli.App {
app := &cli.App{
Name: "serial-read",
Usage: "A serial port reading CLI application",
Name: "telegram message process",
Usage: "A Civial Aviation Authority Telegram message processor",
Before: func(c *cli.Context) error {
// parameter = config.GetParameter()
return nil
},
Commands: []*cli.Command{
{
Name: "listen",
Usage: "Listen to nats messages",
Action: executeListen,
},
},
}
return app
}
func executeListen(c *cli.Context) error {
cfg, err := config.LoadConfig()
log := utils.GetLogger()
if err != nil {
fmt.Printf("Error loading configuration: %v\n", err)
return err
@@ -50,9 +38,47 @@ func executeListen(c *cli.Context) error {
fmt.Printf("Invalid configuration: %v\n", err)
return err
}
overrideConfig(c)
return nil
},
Commands: []*cli.Command{
{
Name: "listen",
Usage: "Listen to nats messages",
Flags: []cli.Flag{
&cli.StringFlag{
Name: "nats",
Usage: "Nats server address",
Value: "nats://localhost:4222",
EnvVars: []string{"NATS_SERVER"},
},
&cli.StringFlag{
Name: "topic",
Usage: "Nats topic to listen to",
Value: "Telegram.Serial",
EnvVars: []string{"NATS_SUBJECT"},
},
},
Action: executeListen,
},
},
}
return app
}
func overrideConfig(c *cli.Context) {
if c.IsSet("nats") {
cfg.Nats.URL = c.String("nats")
}
if c.IsSet("topic") {
cfg.Subscription.Topic = c.String("topic")
}
}
func executeListen(c *cli.Context) error {
// cfg, err := config.LoadConfig()
log := utils.GetLogger()
fmt.Println("Loaded configuration successfully")
log.Info("Starting nats subscriber")
handler := handlers.NewNatsHandler(cfg)
@@ -15,17 +15,17 @@ import (
nc "github.com/nats-io/nats.go"
)
type NatsHandler struct {
type MessageHandler struct {
mu sync.Mutex
config *config.Config
hasuraRepo *repository.HasuraRepository
}
func NewNatsHandler(config *config.Config) *NatsHandler {
return &NatsHandler{config: config, hasuraRepo: repository.NewHasuraRepo(config.Hasura.Endpoint, config.Hasura.Secret)}
func NewNatsHandler(config *config.Config) *MessageHandler {
return &MessageHandler{config: config, hasuraRepo: repository.NewHasuraRepo(config.Hasura.Endpoint, config.Hasura.Secret)}
}
func (n *NatsHandler) HandleMessage(msg *message.Message) error {
func (n *MessageHandler) HandleMessage(msg *message.Message) error {
n.mu.Lock()
defer n.mu.Unlock()
log := utils.GetSugaredLogger()
@@ -45,7 +45,7 @@ func (n *NatsHandler) HandleMessage(msg *message.Message) error {
return nil
}
func (n *NatsHandler) SaveMessage(parsed *domain.ParsedMessage, uuid string) {
func (n *MessageHandler) SaveMessage(parsed *domain.ParsedMessage, uuid string) {
logger := watermill.NewStdLogger(false, false)
if parsed != nil {
parsed.Uuid = uuid
+1 -1
View File
@@ -10,7 +10,7 @@ import (
nc "github.com/nats-io/nats.go"
)
func Subscribe(config *config.Config, marshaler *handlers.PlainTextMarshaler, handler *handlers.NatsHandler) {
func Subscribe(config *config.Config, marshaler *handlers.PlainTextMarshaler, handler *handlers.MessageHandler) {
// marshaler := &PlainTextMarshaler{}
logger := watermill.NewStdLogger(false, false)
options := []nc.Option{