checking for valid command type in json input config

.gitignore

@@ -1,4 +1,5 @@
 ship1/
 ship2/
+tmp/
 incommmingBuffer.db
 store.log

commandOrEventType.go

@@ -6,6 +6,11 @@
 
 package steward
 
+import (
+	"fmt"
+	"log"
+)
+
 // CommandOrEvent describes on the message level if this is
 // an event or command kind of message in the Subject name.
 // This field is mainly used to be able to spawn up different
@@ -59,10 +64,14 @@ type CommandOrEventAvailable struct {
 func (co CommandOrEventAvailable) CheckIfExists(c CommandOrEvent) bool {
 	_, ok := co.topics[c]
 	if ok {
-		// fmt.Printf("******THE TOPIC EXISTS: %v******\n", c)
+		fmt.Println("-------------------------------------------------------------")
+		log.Printf("THE COMMAND OR EVENT EXISTS: %v\n", c)
+		fmt.Println("-------------------------------------------------------------")
 		return true
 	} else {
-		// fmt.Printf("******THE TOPIC DO NOT EXIST: %v******\n", c)
+		fmt.Println("-------------------------------------------------------------")
+		log.Printf("THE COMMAND OR EVENT DO NOT EXIST: %v\n", c)
+		fmt.Println("-------------------------------------------------------------")
 		return false
 	}
 }

example-inmessage/orig-ship1.json

@@ -2,7 +2,7 @@
     {
         
         "toNode": "ship1",
-        "data": ["bash","-c","ls -l ../"],
+        "data": ["bash","-c","netstat -an|grep -i listen"],
         "commandOrEvent":"commandACK",
         "method":"shellCommand"
             

publisher.go

@@ -148,6 +148,7 @@ func (s *server) handleMessagesInRingbuffer() {
 	rb := newringBuffer(bufferSize)
 	inCh := make(chan subjectAndMessage)
 	ringBufferOutCh := make(chan samDBValue)
+	// start the ringbuffer.
 	rb.start(inCh, ringBufferOutCh)
 
 	// Start reading new messages received on the incomming message

ringbuffer.go

@@ -96,9 +96,29 @@ func (r *ringBuffer) fillBuffer(inCh chan subjectAndMessage, samValueBucket stri
 		}
 	}()
 
+	// Prepare the map structure to know what values are allowed
+	// for the commands or events
+	var coe CommandOrEvent
+	coeAvailable := coe.GetCommandOrEventAvailable()
+	coeAvailableValues := []CommandOrEvent{}
+	for v := range coeAvailable.topics {
+		coeAvailableValues = append(coeAvailableValues, v)
+	}
+
 	// Check for incomming messages. These are typically comming from
 	// the go routine who reads inmsg.txt.
 	for v := range inCh {
+
+		// Check if the command or event exists in commandOrEvent.go
+		if !coeAvailable.CheckIfExists(v.Message.CommandOrEvent) {
+			log.Printf("error: the event or command type do not exist, so this message will not be put on the buffer to be processed. Check the syntax used in the json file for the message. Allowed values are : %v\n", coeAvailableValues)
+
+			fmt.Println()
+			// if it was not a valid value, we jump back up, and
+			// continue the range iteration.
+			continue
+		}
+
 		// --- Store the incomming message in the k/v store ---
 
 		// Get a unique number for the message to use when storing

textlogging.log

@@ -26,3 +26,6 @@ some message sent from a ship for testing
 some message sent from a ship for testing
 some message sent from a ship for testing
 some message sent from a ship for testing
+some message sent from a ship for testing
+some message sent from a ship for testing
+some message sent from a ship for testing