mirrors/ctrl
1
0
Fork 0
mirror of https://github.com/postmannen/ctrl.git synced 2025-03-31 01:24:31 +00:00
Code Activity

added flag/env for streams to consume

Browse source
This commit is contained in:
postmannen 2024-11-22 15:44:37 +01:00
parent ab0b0fbe24
commit 20172a3806
2 changed files with 21 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
configuration_flags.go
View file

@ -95,8 +95,8 @@ type Configuration struct {
KeepPublishersAliveFor int `comment:"KeepPublishersAliveFor number of seconds Timer that will be used for when to remove the sub process publisher. The timer is reset each time a message is published with the process, so the sub process publisher will not be removed until it have not received any messages for the given amount of time."`
StartProcesses StartProcesses
// Comma separated list of additional streams to listen on.
Jetstreams string
// Comma separated list of additional streams to consume from.
JetstreamsConsume string
}
type StartProcesses struct {
@ -120,8 +120,7 @@ type StartProcesses struct {
StartJetstreamConsumer bool `comment:"Start the nats jetstream consumer"`
// IsCentralAuth, enable to make this instance take the role as the central auth server
IsCentralAuth bool `comment:"IsCentralAuth, enable to make this instance take the role as the central auth server"`
Jetstreams string `comment: "Comma separated list of additional streams to listen on"`
IsCentralAuth bool `comment:"IsCentralAuth, enable to make this instance take the role as the central auth server"`
}
// NewConfiguration will return a *Configuration.
@ -169,9 +168,8 @@ func NewConfiguration() *Configuration {
flag.StringVar(&c.LogLevel, "logLevel", CheckEnv("LOG_LEVEL", c.LogLevel).(string), "error/info/warning/debug/none")
flag.BoolVar(&c.LogConsoleTimestamps, "LogConsoleTimestamps", CheckEnv("LOG_CONSOLE_TIMESTAMPS", c.LogConsoleTimestamps).(bool), "true/false for enabling or disabling timestamps when printing errors and information to stderr")
flag.IntVar(&c.KeepPublishersAliveFor, "keepPublishersAliveFor", CheckEnv("KEEP_PUBLISHERS_ALIVE_FOR", c.KeepPublishersAliveFor).(int), "The amount of time we allow a publisher to stay alive without receiving any messages to publish")
flag.BoolVar(&c.StartProcesses.StartJetstreamPublisher, "startJetstreamPublisher", CheckEnv("START_JETSTREAM_PUBLISHER", c.StartProcesses.StartJetstreamPublisher).(bool), "Start the nats jetstream publisher")
flag.BoolVar(&c.StartProcesses.StartJetstreamConsumer, "StartJetstreamConsumer", CheckEnv("START_JETSTREAM_CONSUMER", c.StartProcesses.StartJetstreamConsumer).(bool), "Start the nats jetstream consumer")
flag.StringVar(&c.Jetstreams, "jetstreams", CheckEnv("JETSTREAMS", c.Jetstreams).(string), "Comma separated list of Jetstrams to consume")
flag.StringVar(&c.JetstreamsConsume, "jetstreamsConsume", CheckEnv("JETSTREAMS_CONSUME", c.JetstreamsConsume).(string), "Comma separated list of Jetstrams to consume from")
// Start of Request publishers/subscribers
@ -193,6 +191,9 @@ func NewConfiguration() *Configuration {
flag.BoolVar(&c.StartProcesses.StartSubTailFile, "startSubTailFile", CheckEnv("START_SUB_TAIL_FILE", c.StartProcesses.StartSubTailFile).(bool), "true/false")
flag.BoolVar(&c.StartProcesses.StartSubCliCommandCont, "startSubCliCommandCont", CheckEnv("START_SUB_CLI_COMMAND_CONT", c.StartProcesses.StartSubCliCommandCont).(bool), "true/false")
flag.BoolVar(&c.StartProcesses.StartJetstreamPublisher, "startJetstreamPublisher", CheckEnv("START_JETSTREAM_PUBLISHER", c.StartProcesses.StartJetstreamPublisher).(bool), "Start the nats jetstream publisher")
flag.BoolVar(&c.StartProcesses.StartJetstreamConsumer, "StartJetstreamConsumer", CheckEnv("START_JETSTREAM_CONSUMER", c.StartProcesses.StartJetstreamConsumer).(bool), "Start the nats jetstream consumer")
// Check that mandatory flag values have been set.
switch {
case c.NodeName == "":
@ -246,7 +247,7 @@ func newConfigurationDefaults() Configuration {
LogLevel: "debug",
LogConsoleTimestamps: false,
KeepPublishersAliveFor: 10,
Jetstreams: "",
JetstreamsConsume: "",
StartProcesses: StartProcesses{
StartPubHello: 30,

36
processes.go
View file

@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
"log"
"strings"
"sync"
"time"
@ -362,29 +363,6 @@ func (p *processes) Start(proc process) {
log.Fatalf("error: jetstream create or update failed: %v\n", err)
}
// REMOVE: Go routine for injecting messages for testing
// go func() {
// i := 0
// for {
// m := Message{
// ToNode: "btdev1",
// FromNode: proc.node,
// JetstreamToNode: "btdev1",
// Method: CliCommand,
// MethodArgs: []string{"/bin/ash", "-c", "tree"},
// ReplyMethod: Console,
// MethodTimeout: 3,
// //Data: []byte("some text in here............"),
// }
// proc.jetstreamOut <- m
//
// log.Printf("published message: %v\n", i)
// time.Sleep(time.Second * 1)
// i++
// }
//
// }()
for {
// TODO:
select {
@ -428,10 +406,20 @@ func (p *processes) Start(proc process) {
log.Fatalf("error: js.Stream failed: %v\n", err)
}
// Check for more subjects via flags to listen to, and if defined prefix all
// the values with "nodes."
filterSubjectValues := []string{fmt.Sprintf("nodes.%v", proc.server.nodeName), "nodes.all"}
if proc.configuration.JetstreamsConsume != "" {
filterSubjectValues = strings.Split(proc.configuration.JetstreamsConsume, ",")
for i, v := range filterSubjectValues {
filterSubjectValues[i] = fmt.Sprintf("nodes.%v", v)
}
}
consumer, err := stream.CreateOrUpdateConsumer(proc.ctx, jetstream.ConsumerConfig{
Name: "nodes_processor",
Durable: "nodes_processor",
FilterSubjects: []string{fmt.Sprintf("nodes.%v", proc.server.nodeName), "nodes.all"},
FilterSubjects: filterSubjectValues,
})
if err != nil {
log.Fatalf("error: create or update consumer failed: %v\n", err)