added flags/env for starting up jetstream processes

configuration_flags.go

@@ -95,44 +95,33 @@ 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 `comment:"Comma separated list of streams to consume messages from"`
+	Jetstreams string
 }
 
 type StartProcesses struct {
-	// StartPubHello, sets the interval in seconds for how often we send hello messages to central server
 	StartPubHello    int  `comment:"StartPubHello, sets the interval in seconds for how often we send hello messages to central server"`
-	// Enable the updates of public keys
 	EnableKeyUpdates bool `comment:"Enable the updates of public keys"`
 
-	// Enable the updates of acl's
 	EnableAclUpdates bool `comment:"Enable the updates of acl's"`
 
-	// Start the central error logger.
 	IsCentralErrorLogger    bool `comment:"Start the central error logger."`
-	// Start subscriber for hello messages
 	StartSubHello           bool `comment:"Start subscriber for hello messages"`
-	// Start subscriber for text logging
 	StartSubFileAppend      bool `comment:"Start subscriber for text logging"`
-	// Start subscriber for writing to file
 	StartSubFile            bool `comment:"Start subscriber for writing to file"`
-	// Start subscriber for reading files to copy
 	StartSubCopySrc         bool `comment:"Start subscriber for reading files to copy"`
-	// Start subscriber for writing copied files to disk
 	StartSubCopyDst         bool `comment:"Start subscriber for writing copied files to disk"`
-	// Start subscriber for Echo Request
 	StartSubCliCommand      bool `comment:"Start subscriber for CLICommand"`
-	// Start subscriber for Console
 	StartSubConsole         bool `comment:"Start subscriber for Console"`
-	// Start subscriber for HttpGet
 	StartSubHttpGet         bool `comment:"Start subscriber for HttpGet"`
-	// Start subscriber for tailing log files
 	StartSubTailFile        bool `comment:"Start subscriber for tailing log files"`
-	// Start subscriber for continously delivery of output from cli commands.
 	StartSubCliCommandCont  bool `comment:"Start subscriber for continously delivery of output from cli commands."`
+	StartJetstreamPublisher bool `comment:"Start the nats jetstream publisher"`
+	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"`
 }
 
 // NewConfiguration will return a *Configuration.
@@ -180,6 +169,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")
 
 	// Start of Request publishers/subscribers
@@ -273,6 +264,8 @@ func newConfigurationDefaults() Configuration {
 			StartSubTailFile:        true,
 			StartSubCliCommandCont:  true,
 			IsCentralAuth:           false,
+			StartJetstreamPublisher: true,
+			StartJetstreamConsumer:  true,
 		},
 	}
 	return c

processes.go

@@ -343,6 +343,7 @@ func (p *processes) Start(proc process) {
 	// --------------------------------------------------
 	// ProcFunc for Jetstream publishers.
 	// --------------------------------------------------
+	if proc.configuration.StartProcesses.StartJetstreamPublisher {
 		pfJetstreamPublishers := func(ctx context.Context, procFuncCh chan Message) error {
 			js, err := jetstream.New(proc.natsConn)
 			if err != nil {
@@ -362,37 +363,39 @@ func (p *processes) Start(proc process) {
 			}
 
 			// REMOVE: Go routine for injecting messages for testing
-		go func() {
+			// go func() {
-			i := 0
+			// 	i := 0
-			for {
+			// 	for {
-				m := Message{
+			// 		m := Message{
-					ToNode:        "btdev1",
+			// 			ToNode:          "btdev1",
-					FromNode:      proc.node,
+			// 			FromNode:        proc.node,
-					Method:        CliCommand,
+			// 			JetstreamToNode: "btdev1",
-					MethodArgs:    []string{"/bin/ash", "-c", "tree"},
+			// 			Method:          CliCommand,
-					ReplyMethod:   Console,
+			// 			MethodArgs:      []string{"/bin/ash", "-c", "tree"},
-					MethodTimeout: 3,
+			// 			ReplyMethod:     Console,
-					//Data:   []byte("some text in here............"),
+			// 			MethodTimeout:   3,
-				}
+			// 			//Data:   []byte("some text in here............"),
-				proc.jetstreamOut <- m
+			// 		}
-
+			// 		proc.jetstreamOut <- m
-				log.Printf("published message: %v\n", i)
+			//
-				time.Sleep(time.Second * 1)
+			// 		log.Printf("published message: %v\n", i)
-				i++
+			// 		time.Sleep(time.Second * 1)
-			}
+			// 		i++
-
+			// 	}
-		}()
+			//
+			// }()
 
 			for {
 				// TODO:
 				select {
-			case msgJS := <-proc.jetstreamOut:
+				case msg := <-proc.jetstreamOut:
-				b, err := json.Marshal(msgJS)
+					b, err := json.Marshal(msg)
 					if err != nil {
 						log.Fatalf("error: pfJetstreamPublishers: js failed to marshal message: %v\n", err)
 					}
 
-				_, err = js.Publish(proc.ctx, "nodes.btdev1", b)
+					subject := fmt.Sprintf("nodes.%v", msg.JetstreamToNode)
+					_, err = js.Publish(proc.ctx, subject, b)
 					if err != nil {
 						log.Fatalf("error: pfJetstreamPublishers:js failed to publish message: %v\n", err)
 					}
@@ -402,6 +405,7 @@ func (p *processes) Start(proc process) {
 			}
 		}
 		proc.startup.publisher(proc, JetStreamPublishers, pfJetstreamPublishers)
+	}
 
 	// --------------------------------------------------
 	// Procfunc for Jetstream consumers.
@@ -412,6 +416,7 @@ func (p *processes) Start(proc process) {
 	// After a jetstream message is picked up from the stream, the steward message
 	// will be extracted from the data field, and the ctrl message will be put
 	// on the local delivery channel, and handled as a normal ctrl message.
+	if proc.configuration.StartProcesses.StartJetstreamConsumer {
 		pfJetstreamConsumers := func(ctx context.Context, procFuncCh chan Message) error {
 			js, err := jetstream.New(proc.natsConn)
 			if err != nil {
@@ -463,6 +468,7 @@ func (p *processes) Start(proc process) {
 		}
 
 		proc.startup.subscriber(proc, JetstreamConsumers, pfJetstreamConsumers)
+	}
 
 }