mirrors/ctrl
mirrors/ctrl
1
0
Fork 0
mirror of https://github.com/postmannen/ctrl.git synced 2024-12-14 12:37:31 +00:00
Code Activity

added sending errors with request back to the originating node

Browse source
This commit is contained in:
postmannen 2023-01-04 12:27:58 +01:00
parent 75126ce977
commit 94135aab67
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
requests_cli.go
View file

@ -23,6 +23,9 @@ func (m methodREQCliCommand) handler(proc process, message Message, node string)
inf := fmt.Errorf("<--- CLICommandREQUEST received from: %v, containing: %v", message.FromNode, message.MethodArgs)
proc.errorKernel.logConsoleOnlyIfDebug(inf, proc.configuration)
msgForErrors := message
msgForErrors.FileName = msgForErrors.FileName + ".error"
// Execute the CLI command in it's own go routine, so we are able
// to return immediately with an ack reply that the messag was
// received, and we create a new message to send back to the calling
@ -37,6 +40,7 @@ func (m methodREQCliCommand) handler(proc process, message Message, node string)
case len(message.MethodArgs) < 1:
er := fmt.Errorf("error: methodREQCliCommand: got <1 number methodArgs")
proc.errorKernel.errSend(proc, message, er)
newReplyMessage(proc, msgForErrors, []byte(er.Error()))
return
case len(message.MethodArgs) >= 0:
@ -87,6 +91,7 @@ func (m methodREQCliCommand) handler(proc process, message Message, node string)
if err != nil {
er := fmt.Errorf("error: methodREQCliCommand: cmd.Run failed : %v, methodArgs: %v, error_output: %v", err, message.MethodArgs, stderr.String())
proc.errorKernel.errSend(proc, message, er)
newReplyMessage(proc, msgForErrors, []byte(er.Error()))
}
select {
@ -101,6 +106,7 @@ func (m methodREQCliCommand) handler(proc process, message Message, node string)
cancel()
er := fmt.Errorf("error: methodREQCliCommand: method timed out: %v", message.MethodArgs)
proc.errorKernel.errSend(proc, message, er)
newReplyMessage(proc, msgForErrors, []byte(er.Error()))
case out := <-outCh:
cancel()
@ -142,6 +148,9 @@ func (m methodREQCliCommandCont) handler(proc process, message Message, node str
inf := fmt.Errorf("<--- CLInCommandCont REQUEST received from: %v, containing: %v", message.FromNode, message.Data)
proc.errorKernel.logConsoleOnlyIfDebug(inf, proc.configuration)
msgForErrors := message
msgForErrors.FileName = msgForErrors.FileName + ".error"
// Execute the CLI command in it's own go routine, so we are able
// to return immediately with an ack reply that the message was
// received, and we create a new message to send back to the calling
@ -160,6 +169,7 @@ func (m methodREQCliCommandCont) handler(proc process, message Message, node str
case len(message.MethodArgs) < 1:
er := fmt.Errorf("error: methodREQCliCommand: got <1 number methodArgs")
proc.errorKernel.errSend(proc, message, er)
newReplyMessage(proc, msgForErrors, []byte(er.Error()))
return
case len(message.MethodArgs) >= 0:
@ -188,17 +198,20 @@ func (m methodREQCliCommandCont) handler(proc process, message Message, node str
if err != nil {
er := fmt.Errorf("error: methodREQCliCommandCont: cmd.StdoutPipe failed : %v, methodArgs: %v", err, message.MethodArgs)
proc.errorKernel.errSend(proc, message, er)
newReplyMessage(proc, msgForErrors, []byte(er.Error()))
}
ErrorReader, err := cmd.StderrPipe()
if err != nil {
er := fmt.Errorf("error: methodREQCliCommandCont: cmd.StderrPipe failed : %v, methodArgs: %v", err, message.MethodArgs)
proc.errorKernel.errSend(proc, message, er)
newReplyMessage(proc, msgForErrors, []byte(er.Error()))
}
if err := cmd.Start(); err != nil {
er := fmt.Errorf("error: methodREQCliCommandCont: cmd.Start failed : %v, methodArgs: %v", err, message.MethodArgs)
proc.errorKernel.errSend(proc, message, er)
newReplyMessage(proc, msgForErrors, []byte(er.Error()))
}
go func() {
@ -240,6 +253,7 @@ func (m methodREQCliCommandCont) handler(proc process, message Message, node str
cancel()
er := fmt.Errorf("info: methodREQCliCommandCont: method timeout reached, canceling: methodArgs: %v", message.MethodArgs)
proc.errorKernel.infoSend(proc, message, er)
newReplyMessage(proc, msgForErrors, []byte(er.Error()))
return
case out := <-outCh:
// fmt.Printf(" * out: %v\n", string(out))

9
requests_http.go
View file

@ -22,6 +22,9 @@ func (m methodREQHttpGet) handler(proc process, message Message, node string) ([
inf := fmt.Errorf("<--- REQHttpGet received from: %v, containing: %v", message.FromNode, message.Data)
proc.errorKernel.logConsoleOnlyIfDebug(inf, proc.configuration)
msgForErrors := message
msgForErrors.FileName = msgForErrors.FileName + ".error"
proc.processes.wg.Add(1)
go func() {
defer proc.processes.wg.Done()
@ -30,6 +33,7 @@ func (m methodREQHttpGet) handler(proc process, message Message, node string) ([
case len(message.MethodArgs) < 1:
er := fmt.Errorf("error: methodREQHttpGet: got <1 number methodArgs")
proc.errorKernel.errSend(proc, message, er)
newReplyMessage(proc, msgForErrors, []byte(er.Error()))
return
}
@ -47,6 +51,7 @@ func (m methodREQHttpGet) handler(proc process, message Message, node string) ([
if err != nil {
er := fmt.Errorf("error: methodREQHttpGet: NewRequest failed: %v, bailing out: %v", err, message.MethodArgs)
proc.errorKernel.errSend(proc, message, er)
newReplyMessage(proc, msgForErrors, []byte(er.Error()))
cancel()
return
}
@ -61,6 +66,7 @@ func (m methodREQHttpGet) handler(proc process, message Message, node string) ([
if err != nil {
er := fmt.Errorf("error: methodREQHttpGet: client.Do failed: %v, bailing out: %v", err, message.MethodArgs)
proc.errorKernel.errSend(proc, message, er)
newReplyMessage(proc, msgForErrors, []byte(er.Error()))
return
}
defer resp.Body.Close()
@ -69,6 +75,7 @@ func (m methodREQHttpGet) handler(proc process, message Message, node string) ([
cancel()
er := fmt.Errorf("error: methodREQHttpGet: not 200, were %#v, bailing out: %v", resp.StatusCode, message)
proc.errorKernel.errSend(proc, message, er)
newReplyMessage(proc, msgForErrors, []byte(er.Error()))
return
}
@ -76,6 +83,7 @@ func (m methodREQHttpGet) handler(proc process, message Message, node string) ([
if err != nil {
er := fmt.Errorf("error: methodREQHttpGet: io.ReadAll failed : %v, methodArgs: %v", err, message.MethodArgs)
proc.errorKernel.errSend(proc, message, er)
newReplyMessage(proc, msgForErrors, []byte(er.Error()))
}
out := body
@ -92,6 +100,7 @@ func (m methodREQHttpGet) handler(proc process, message Message, node string) ([
cancel()
er := fmt.Errorf("error: methodREQHttpGet: method timed out: %v", message.MethodArgs)
proc.errorKernel.errSend(proc, message, er)
newReplyMessage(proc, msgForErrors, []byte(er.Error()))
case out := <-outCh:
cancel()