From 3368448cd720d80c39451f7f10e87a99e9216c93 Mon Sep 17 00:00:00 2001 From: postmannen Date: Wed, 7 Apr 2021 06:16:08 +0200 Subject: [PATCH] removed label from subject --- example/toShip1-REQHttpGet.json | 2 +- message_and_subject.go | 3 --- read_socket.go | 1 - subscriber_method_types.go | 3 +++ 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/example/toShip1-REQHttpGet.json b/example/toShip1-REQHttpGet.json index bce26b3..914304d 100644 --- a/example/toShip1-REQHttpGet.json +++ b/example/toShip1-REQHttpGet.json @@ -1,6 +1,6 @@ [ { - "label":"metrics/vg.no/annet/minside/", + "label":"metrics/network/sniffer", "toNode": "ship1", "data": ["http://vg.no"], "method":"REQHttpGet", diff --git a/message_and_subject.go b/message_and_subject.go index 7c5168a..b0cb7e4 100644 --- a/message_and_subject.go +++ b/message_and_subject.go @@ -82,9 +82,6 @@ type Subject struct { // from routeMessagesToPublish in *server. // This channel is only used for publishing processes. messageCh chan Message - // Label, single word used to describe the data content. For example - // syslog, metrics, etc. - Label string } // newSubject will return a new variable of the type subject, and insert diff --git a/read_socket.go b/read_socket.go index 981c284..be22b90 100644 --- a/read_socket.go +++ b/read_socket.go @@ -104,7 +104,6 @@ func newSAM(m Message) (subjectAndMessage, error) { ToNode: string(m.ToNode), CommandOrEvent: tmpH.getKind(), Method: m.Method, - Label: m.Label, } sm := subjectAndMessage{ diff --git a/subscriber_method_types.go b/subscriber_method_types.go index f71bcd2..1e31c33 100644 --- a/subscriber_method_types.go +++ b/subscriber_method_types.go @@ -359,12 +359,15 @@ func (m methodREQTextToFile) handler(proc process, message Message, node string) // information from, so we use the one that are in the current mesage. fileName = fmt.Sprintf("%v.%v.log", message.ToNode, message.Method) folderTree = filepath.Join(proc.configuration.SubscribersDataFolder, message.Label, string(message.FromNode)) + fmt.Printf(" ** DEBUG1: foldertree: %v\n", folderTree) case message.PreviousMessage.ToNode != "": fileName = fmt.Sprintf("%v.%v.log", message.PreviousMessage.ToNode, message.PreviousMessage.Method) folderTree = filepath.Join(proc.configuration.SubscribersDataFolder, message.PreviousMessage.Label, string(message.PreviousMessage.ToNode)) + fmt.Printf(" ** DEBUG2: foldertree: %v\n", folderTree) case message.PreviousMessage.ToNode == "": fileName = fmt.Sprintf("%v.%v.log", message.FromNode, message.Method) folderTree = filepath.Join(proc.configuration.SubscribersDataFolder, message.PreviousMessage.Label, string(message.PreviousMessage.ToNode)) + fmt.Printf(" ** DEBUG3: foldertree: %v\n", folderTree) } // Check if folder structure exist, if not create it.