mirrors/ctrl
1
0
Fork 0
mirror of https://github.com/postmannen/ctrl.git synced 2025-03-05 06:46:48 +00:00
Code Activity

removed old code

Browse source
This commit is contained in:
postmannen 2021-11-16 11:30:05 +01:00
parent 215a4ffd19
commit 37d120950e
2 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
process.go
View file

@ -332,34 +332,23 @@ func (p process) subscriberHandler(natsConn *nats.Conn, thisNode string, msg *na
// also can send the a copy of the reply back to where it originated.
if message.PreviousMessage != nil && message.PreviousMessage.RelayViaNode != "" {
// fmt.Printf("\n message.PreviousMessage.RelayViaNode: %v\n\n", message.PreviousMessage.RelayViaNode)
// make a copy of the message
msgCopy := message
// fmt.Printf("\n *DEBUG0 msgCopy: %#v\n\n ", pretty.Formatter(msgCopy))
msgCopy.ToNode = msgCopy.PreviousMessage.RelayFromNode
// If no RelayReplyMethod is set, we default to the replyMethod
// of the initial message.
//fmt.Printf(" * replyMethod: %v\n", message.ReplyMethod)
//fmt.Printf(" * previous replyMethod: %v\n", message.PreviousMessage.ReplyMethod)
//
//fmt.Printf(" * message.RelayReplyMethod: %v\n", message.RelayReplyMethod)
//fmt.Printf(" * previous message.PreviousMessage.RelayReplyMethod: %v\n", message.PreviousMessage.RelayReplyMethod)
switch {
case msgCopy.PreviousMessage.RelayReplyMethod == "":
fmt.Printf("\n *DEBUG0.1 msgCopy: \n ")
msgCopy.Method = msgCopy.PreviousMessage.ReplyMethod
case msgCopy.PreviousMessage.RelayReplyMethod != "":
msgCopy.Method = msgCopy.PreviousMessage.RelayReplyMethod
}
// fmt.Printf("\n *DEBUG1 msgCopy: %#v\n\n ", pretty.Formatter(msgCopy))
// Reset the previosMessage relay fields so the message don't loop.
message.PreviousMessage.RelayViaNode = ""
// fmt.Printf("\n *DEBUG2 msgCopy: %#v\n\n ", pretty.Formatter(msgCopy))
sam, err := newSubjectAndMessage(msgCopy)
if err != nil {
er := fmt.Errorf("error: newSubjectAndMessage : %v, message copy: %v", err, msgCopy)
@ -367,7 +356,6 @@ func (p process) subscriberHandler(natsConn *nats.Conn, thisNode string, msg *na
log.Printf("%v\n", er)
}
// fmt.Printf("\n *DEBUG3 Created sam: %#v\n\n ", pretty.Formatter(sam))
p.toRingbufferCh <- []subjectAndMessage{sam}
}
@ -475,7 +463,7 @@ func (p process) publishMessages(natsConn *nats.Conn) {
p.processes.active.mu.Lock()
procToUpdate, ok := p.processes.active.procNames[pn]
if !ok {
fmt.Printf(" * debugError: found no proc to update by that name: %v\n", pn)
log.Printf(" * debugError: found no proc to update by that name: %v\n", pn)
}
procToUpdate[p.processID] = p

4
requests.go
View file

@ -1548,11 +1548,8 @@ func (m methodREQRelay) getKind() CommandOrEvent {
func (m methodREQRelay) handler(proc process, message Message, node string) ([]byte, error) {
// relay the message here to the actual host here.
// fmt.Printf("\n * DEBUG Got relay message: %#v\n\n ", pretty.Formatter(message))
message.ToNode = message.RelayToNode
message.FromNode = Node(node)
// fmt.Printf(" * DEBUG THE VALUES OF, proc.configuration.NodeName: %v, node:%v\n ", proc.configuration.NodeName, node)
message.Method = message.RelayOriginalMethod
sam, err := newSubjectAndMessage(message)
@ -1562,7 +1559,6 @@ func (m methodREQRelay) handler(proc process, message Message, node string) ([]b
log.Printf("%v\n", er)
}
// fmt.Printf("\n * DEBUG: Created sam: %#v\n\n ", pretty.Formatter(sam))
proc.toRingbufferCh <- []subjectAndMessage{sam}
// Send back an ACK message.