mirror of
https://github.com/postmannen/ctrl.git
synced 2025-03-31 01:24:31 +00:00
replaced log statements with errorKernel logger
This commit is contained in:
parent
5d9e57db20
commit
7e71064adf
4 changed files with 71 additions and 68 deletions
|
@ -72,7 +72,8 @@ func (s *server) readStartupFolder() {
|
|||
for i := range sams {
|
||||
if sams[i].Message.FromNode == "" {
|
||||
sams = append(sams[:i], sams[i+1:]...)
|
||||
log.Printf(" error: missing from field in startup message\n")
|
||||
er := fmt.Errorf(" error: missing from field in startup message")
|
||||
s.errorKernel.errSend(s.processInitial, Message{}, er)
|
||||
}
|
||||
|
||||
// Bounds check.
|
||||
|
@ -337,8 +338,9 @@ func (s *server) convertBytesToSAMs(b []byte) ([]subjectAndMessage, error) {
|
|||
for _, m := range MsgSlice {
|
||||
sm, err := newSubjectAndMessage(m)
|
||||
if err != nil {
|
||||
s.processes.errorKernel.errSend(s.processInitial, m, err)
|
||||
log.Printf("error: jsonFromFileData: %v\n", err)
|
||||
er := fmt.Errorf("error: newSubjectAndMessage: %v", err)
|
||||
s.processes.errorKernel.errSend(s.processInitial, m, er)
|
||||
|
||||
continue
|
||||
}
|
||||
sam = append(sam, sm)
|
||||
|
|
21
process.go
21
process.go
|
@ -287,11 +287,12 @@ func (p process) messageDeliverNats(natsMsgPayload []byte, natsMsgHeader nats.He
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: ack receive failed: subject=%v: %v", p.subject.name(), err)
|
||||
// sendErrorLogMessage(p.toRingbufferCh, p.node, er)
|
||||
log.Printf(" ** %v\n", er)
|
||||
p.processes.errorKernel.logConsoleOnlyIfDebug(er, p.configuration)
|
||||
|
||||
// did not receive a reply, decide what to do..
|
||||
retryAttempts++
|
||||
log.Printf("Retry attempt:%v, retries: %v, ACKTimeout: %v, message.ID: %v\n", retryAttempts, message.Retries, message.ACKTimeout, message.ID)
|
||||
er = fmt.Errorf("retry attempt:%v, retries: %v, ack timeout: %v, message.ID: %v", retryAttempts, message.Retries, message.ACKTimeout, message.ID)
|
||||
p.processes.errorKernel.logConsoleOnlyIfDebug(er, p.configuration)
|
||||
|
||||
switch {
|
||||
//case message.Retries == 0:
|
||||
|
@ -307,8 +308,6 @@ func (p process) messageDeliverNats(natsMsgPayload []byte, natsMsgHeader nats.He
|
|||
p.processes.errorKernel.infoSend(p, message, er)
|
||||
}
|
||||
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
subReply.Unsubscribe()
|
||||
|
||||
p.processes.metrics.promNatsMessagesFailedACKsTotal.Inc()
|
||||
|
@ -316,7 +315,9 @@ func (p process) messageDeliverNats(natsMsgPayload []byte, natsMsgHeader nats.He
|
|||
|
||||
default:
|
||||
// none of the above matched, so we've not reached max retries yet
|
||||
log.Printf("max retries for message not reached, retrying sending of message with ID %v\n", message.ID)
|
||||
er := fmt.Errorf("max retries for message not reached, retrying sending of message with ID %v", message.ID)
|
||||
p.processes.errorKernel.logConsoleOnlyIfDebug(er, p.configuration)
|
||||
|
||||
p.processes.metrics.promNatsMessagesMissedACKsTotal.Inc()
|
||||
continue
|
||||
}
|
||||
|
@ -470,7 +471,6 @@ func (p process) messageSubscriberHandler(natsConn *nats.Conn, thisNode string,
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: subscriberHandler: newSubjectAndMessage : %v, message copy: %v", err, msgCopy)
|
||||
p.processes.errorKernel.errSend(p, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
}
|
||||
|
||||
p.toRingbufferCh <- []subjectAndMessage{sam}
|
||||
|
@ -504,6 +504,13 @@ func (p process) messageSubscriberHandler(natsConn *nats.Conn, thisNode string,
|
|||
out := []byte{}
|
||||
var err error
|
||||
|
||||
// TODO: This is not correct. As it is now we only want signature checking
|
||||
// for REQCliCommand, but this will only call the handler if that is true,
|
||||
// or that the EnableSignatureCheck flag is set. This will lead to all other
|
||||
// REQ types being discarded since we don't call the mh.Handler method for
|
||||
// those REQ.
|
||||
// NB: Add the logic for also calling mh.handler for those other methods
|
||||
// that don't need a valid signature.
|
||||
if p.signatures.verifySignature(message) {
|
||||
// Call the method handler for the specified method.
|
||||
out, err = mh.handler(p, message, thisNode)
|
||||
|
@ -694,7 +701,7 @@ func (p process) publishAMessage(m Message, zEnc *zstd.Encoder, once sync.Once,
|
|||
|
||||
default: // no compression
|
||||
// Allways log the error to console.
|
||||
er := fmt.Errorf("error: PUBLISHING: compression type not defined, setting default to no compression")
|
||||
er := fmt.Errorf("error: publishing: compression type not defined, setting default to no compression")
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
// We only wan't to send the error message to errorCentral once.
|
||||
|
|
107
requests.go
107
requests.go
|
@ -38,7 +38,6 @@ import (
|
|||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"net/http"
|
||||
"os"
|
||||
"os/exec"
|
||||
|
@ -351,7 +350,6 @@ func newReplyMessage(proc process, message Message, outData []byte) {
|
|||
// In theory the system should drop the message before it reaches here.
|
||||
er := fmt.Errorf("error: newSubjectAndMessage : %v, message: %v", err, message)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
}
|
||||
|
||||
proc.toRingbufferCh <- []subjectAndMessage{sam}
|
||||
|
@ -456,7 +454,6 @@ func (m methodREQOpProcessStart) handler(proc process, message Message, node str
|
|||
case len(message.MethodArgs) < 1:
|
||||
er := fmt.Errorf("error: methodREQOpProcessStart: got <1 number methodArgs")
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -522,7 +519,6 @@ func (m methodREQOpProcessStop) handler(proc process, message Message, node stri
|
|||
if v := len(message.MethodArgs); v != 3 {
|
||||
er := fmt.Errorf("error: methodREQOpProcessStop: got <4 number methodArgs, want: method,node,kind")
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
}
|
||||
|
||||
methodString := message.MethodArgs[0]
|
||||
|
@ -560,7 +556,6 @@ func (m methodREQOpProcessStop) handler(proc process, message Message, node stri
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: methodREQOpStopProcess failed to stop nats.Subscription: %v, methodArgs: %v", err, message.MethodArgs)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
}
|
||||
|
||||
// Remove the prometheus label
|
||||
|
@ -569,7 +564,6 @@ func (m methodREQOpProcessStop) handler(proc process, message Message, node stri
|
|||
txt := fmt.Sprintf("info: OpProcessStop: process stopped id: %v, method: %v on: %v", toStopProc.processID, sub, message.ToNode)
|
||||
er := fmt.Errorf(txt)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
out = []byte(txt + "\n")
|
||||
newReplyMessage(proc, message, out)
|
||||
|
@ -578,7 +572,6 @@ func (m methodREQOpProcessStop) handler(proc process, message Message, node stri
|
|||
txt := fmt.Sprintf("error: OpProcessStop: did not find process to stop: %v on %v", sub, message.ToNode)
|
||||
er := fmt.Errorf(txt)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
out = []byte(txt + "\n")
|
||||
newReplyMessage(proc, message, out)
|
||||
|
@ -616,10 +609,10 @@ func (m methodREQToFileAppend) handler(proc process, message Message, node strin
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: methodREQToFileAppend: failed to create toFileAppend directory tree:%v, subject: %v, %v", folderTree, proc.subject, err)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
}
|
||||
|
||||
log.Printf("info: Creating subscribers data folder at %v\n", folderTree)
|
||||
er := fmt.Errorf("info: Creating subscribers data folder at %v", folderTree)
|
||||
proc.processes.errorKernel.logConsoleOnlyIfDebug(er, proc.configuration)
|
||||
}
|
||||
|
||||
// Open file and write data.
|
||||
|
@ -628,7 +621,6 @@ func (m methodREQToFileAppend) handler(proc process, message Message, node strin
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: methodREQToFileAppend.handler: failed to open file: %v, %v", file, err)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
return nil, err
|
||||
}
|
||||
defer f.Close()
|
||||
|
@ -638,7 +630,6 @@ func (m methodREQToFileAppend) handler(proc process, message Message, node strin
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: methodEventTextLogging.handler: failed to write to file : %v, %v", file, err)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
}
|
||||
|
||||
ackMsg := []byte("confirmed from: " + node + ": " + fmt.Sprint(message.ID))
|
||||
|
@ -669,12 +660,12 @@ func (m methodREQToFile) handler(proc process, message Message, node string) ([]
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: methodREQToFile failed to create toFile directory tree: subject:%v, folderTree: %v, %v", proc.subject, folderTree, err)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
return nil, er
|
||||
}
|
||||
|
||||
log.Printf("info: Creating subscribers data folder at %v\n", folderTree)
|
||||
er := fmt.Errorf("info: Creating subscribers data folder at %v", folderTree)
|
||||
proc.processes.errorKernel.logConsoleOnlyIfDebug(er, proc.configuration)
|
||||
}
|
||||
|
||||
// Open file and write data.
|
||||
|
@ -683,7 +674,7 @@ func (m methodREQToFile) handler(proc process, message Message, node string) ([]
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: methodREQToFile.handler: failed to open file, check that you've specified a value for fileName in the message: directory: %v, fileName: %v, %v", message.Directory, message.FileName, err)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
return nil, err
|
||||
}
|
||||
defer f.Close()
|
||||
|
@ -693,7 +684,6 @@ func (m methodREQToFile) handler(proc process, message Message, node string) ([]
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: methodEventTextLogging.handler: failed to write to file: file: %v, %v", file, err)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
}
|
||||
|
||||
ackMsg := []byte("confirmed from: " + node + ": " + fmt.Sprint(message.ID))
|
||||
|
@ -722,7 +712,7 @@ func (m methodREQCopyFileFrom) handler(proc process, message Message, node strin
|
|||
case len(message.MethodArgs) < 3:
|
||||
er := fmt.Errorf("error: methodREQCopyFileFrom: got <3 number methodArgs: want srcfilePath,dstNode,dstFilePath")
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -777,7 +767,6 @@ func (m methodREQCopyFileFrom) handler(proc process, message Message, node strin
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: newSubjectAndMessage : %v, message: %v", err, message)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
}
|
||||
|
||||
proc.toRingbufferCh <- []subjectAndMessage{sam}
|
||||
|
@ -875,7 +864,7 @@ func (m methodREQCopyFileTo) handler(proc process, message Message, node string)
|
|||
case len(message.MethodArgs) < 3:
|
||||
er := fmt.Errorf("error: methodREQCopyFileTo: got <3 number methodArgs: want srcfilePath,dstNode,dstFilePath")
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -896,7 +885,10 @@ func (m methodREQCopyFileTo) handler(proc process, message Message, node string)
|
|||
return
|
||||
}
|
||||
|
||||
log.Printf("info: MethodREQCopyFileTo: Creating folders %v\n", dstDir)
|
||||
{
|
||||
er := fmt.Errorf("info: MethodREQCopyFileTo: Creating folders %v", dstDir)
|
||||
proc.processes.errorKernel.logConsoleOnlyIfDebug(er, proc.configuration)
|
||||
}
|
||||
}
|
||||
|
||||
// Open file and write data. Truncate and overwrite any existing files.
|
||||
|
@ -970,7 +962,8 @@ func (m methodREQHello) handler(proc process, message Message, node string) ([]b
|
|||
return nil, fmt.Errorf("error: failed to create errorLog directory tree %v: %v", folderTree, err)
|
||||
}
|
||||
|
||||
log.Printf("info: Creating subscribers data folder at %v\n", folderTree)
|
||||
er := fmt.Errorf("info: Creating subscribers data folder at %v", folderTree)
|
||||
proc.processes.errorKernel.logConsoleOnlyIfDebug(er, proc.configuration)
|
||||
}
|
||||
|
||||
// Open file and write data.
|
||||
|
@ -979,15 +972,16 @@ func (m methodREQHello) handler(proc process, message Message, node string) ([]b
|
|||
f, err := os.OpenFile(file, os.O_TRUNC|os.O_RDWR|os.O_CREATE|os.O_SYNC, 0600)
|
||||
|
||||
if err != nil {
|
||||
log.Printf("error: methodREQHello.handler: failed to open file: %v\n", err)
|
||||
return nil, err
|
||||
er := fmt.Errorf("error: methodREQHello.handler: failed to open file: %v", err)
|
||||
return nil, er
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
_, err = f.Write([]byte(data))
|
||||
f.Sync()
|
||||
if err != nil {
|
||||
log.Printf("error: methodEventTextLogging.handler: failed to write to file: %v\n", err)
|
||||
er := fmt.Errorf("error: methodEventTextLogging.handler: failed to write to file: %v", err)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
}
|
||||
|
||||
// --------------------------
|
||||
|
@ -1025,22 +1019,24 @@ func (m methodREQErrorLog) handler(proc process, message Message, node string) (
|
|||
return nil, fmt.Errorf("error: failed to create errorLog directory tree %v: %v", folderTree, err)
|
||||
}
|
||||
|
||||
log.Printf("info: Creating subscribers data folder at %v\n", folderTree)
|
||||
er := fmt.Errorf("info: Creating subscribers data folder at %v", folderTree)
|
||||
proc.processes.errorKernel.logConsoleOnlyIfDebug(er, proc.configuration)
|
||||
}
|
||||
|
||||
// Open file and write data.
|
||||
file := filepath.Join(folderTree, fileName)
|
||||
f, err := os.OpenFile(file, os.O_APPEND|os.O_RDWR|os.O_CREATE|os.O_SYNC, 0600)
|
||||
if err != nil {
|
||||
log.Printf("error: methodREQErrorLog.handler: failed to open file: %v\n", err)
|
||||
return nil, err
|
||||
er := fmt.Errorf("error: methodREQErrorLog.handler: failed to open file: %v", err)
|
||||
return nil, er
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
_, err = f.Write(message.Data)
|
||||
f.Sync()
|
||||
if err != nil {
|
||||
log.Printf("error: methodEventTextLogging.handler: failed to write to file: %v\n", err)
|
||||
er := fmt.Errorf("error: methodEventTextLogging.handler: failed to write to file: %v", err)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
}
|
||||
|
||||
ackMsg := []byte("confirmed from: " + node + ": " + fmt.Sprint(message.ID))
|
||||
|
@ -1071,12 +1067,12 @@ func (m methodREQPing) handler(proc process, message Message, node string) ([]by
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: methodREQPing.handler: failed to create toFile directory tree: %v, %v", folderTree, err)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
return nil, er
|
||||
}
|
||||
|
||||
log.Printf("info: Creating subscribers data folder at %v\n", folderTree)
|
||||
er := fmt.Errorf("info: Creating subscribers data folder at %v", folderTree)
|
||||
proc.processes.errorKernel.logConsoleOnlyIfDebug(er, proc.configuration)
|
||||
}
|
||||
|
||||
// Open file.
|
||||
|
@ -1085,7 +1081,7 @@ func (m methodREQPing) handler(proc process, message Message, node string) ([]by
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: methodREQPing.handler: failed to open file, check that you've specified a value for fileName in the message: directory: %v, fileName: %v, %v", message.Directory, message.FileName, err)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
return nil, err
|
||||
}
|
||||
defer f.Close()
|
||||
|
@ -1097,7 +1093,6 @@ func (m methodREQPing) handler(proc process, message Message, node string) ([]by
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: methodREQPing.handler: failed to write to file: directory: %v, fileName: %v, %v", message.Directory, message.FileName, err)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
}
|
||||
|
||||
proc.processes.wg.Add(1)
|
||||
|
@ -1135,12 +1130,12 @@ func (m methodREQPong) handler(proc process, message Message, node string) ([]by
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: methodREQPong.handler: failed to create toFile directory tree %v: %v", folderTree, err)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
return nil, er
|
||||
}
|
||||
|
||||
log.Printf("info: Creating subscribers data folder at %v\n", folderTree)
|
||||
er := fmt.Errorf("info: Creating subscribers data folder at %v", folderTree)
|
||||
proc.processes.errorKernel.logConsoleOnlyIfDebug(er, proc.configuration)
|
||||
}
|
||||
|
||||
// Open file.
|
||||
|
@ -1149,7 +1144,7 @@ func (m methodREQPong) handler(proc process, message Message, node string) ([]by
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: methodREQPong.handler: failed to open file, check that you've specified a value for fileName in the message: directory: %v, fileName: %v, %v", message.Directory, message.FileName, err)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
return nil, err
|
||||
}
|
||||
defer f.Close()
|
||||
|
@ -1161,7 +1156,6 @@ func (m methodREQPong) handler(proc process, message Message, node string) ([]by
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: methodREQPong.handler: failed to write to file: directory: %v, fileName: %v, %v", message.Directory, message.FileName, err)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
}
|
||||
|
||||
ackMsg := []byte("confirmed from: " + node + ": " + fmt.Sprint(message.ID))
|
||||
|
@ -1182,7 +1176,8 @@ func (m methodREQCliCommand) getKind() Event {
|
|||
// return the output of the command run back to the calling publisher
|
||||
// as a new message.
|
||||
func (m methodREQCliCommand) handler(proc process, message Message, node string) ([]byte, error) {
|
||||
log.Printf("<--- CLICommandREQUEST received from: %v, containing: %v", message.FromNode, message.MethodArgs)
|
||||
inf := fmt.Errorf("<--- CLICommandREQUEST received from: %v, containing: %v", message.FromNode, message.MethodArgs)
|
||||
proc.processes.errorKernel.logConsoleOnlyIfDebug(inf, proc.configuration)
|
||||
|
||||
// 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
|
||||
|
@ -1198,7 +1193,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.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
return
|
||||
case len(message.MethodArgs) >= 0:
|
||||
a = message.MethodArgs[1:]
|
||||
|
@ -1304,7 +1299,8 @@ func (m methodREQToConsole) handler(proc process, message Message, node string)
|
|||
if proc.processes.tui.toConsoleCh != nil {
|
||||
proc.processes.tui.toConsoleCh <- message.Data
|
||||
} else {
|
||||
log.Printf("error: no tui client started\n")
|
||||
er := fmt.Errorf("error: no tui client started")
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
}
|
||||
default:
|
||||
fmt.Fprintf(os.Stdout, "%v", string(message.Data))
|
||||
|
@ -1332,7 +1328,8 @@ func (m methodREQTuiToConsole) handler(proc process, message Message, node strin
|
|||
if proc.processes.tui.toConsoleCh != nil {
|
||||
proc.processes.tui.toConsoleCh <- message.Data
|
||||
} else {
|
||||
log.Printf("error: no tui client started\n")
|
||||
er := fmt.Errorf("error: no tui client started")
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
}
|
||||
|
||||
ackMsg := []byte("confirmed from: " + node + ": " + fmt.Sprint(message.ID))
|
||||
|
@ -1351,7 +1348,8 @@ func (m methodREQHttpGet) getKind() Event {
|
|||
|
||||
// handler to do a Http Get.
|
||||
func (m methodREQHttpGet) handler(proc process, message Message, node string) ([]byte, error) {
|
||||
log.Printf("<--- REQHttpGet received from: %v, containing: %v", message.FromNode, message.Data)
|
||||
inf := fmt.Errorf("<--- REQHttpGet received from: %v, containing: %v", message.FromNode, message.Data)
|
||||
proc.processes.errorKernel.logConsoleOnlyIfDebug(inf, proc.configuration)
|
||||
|
||||
proc.processes.wg.Add(1)
|
||||
go func() {
|
||||
|
@ -1361,7 +1359,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.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -1407,7 +1405,6 @@ 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.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
}
|
||||
|
||||
out := body
|
||||
|
@ -1451,7 +1448,8 @@ func (m methodREQHttpGetScheduled) getKind() Event {
|
|||
// handler to do a Http Get Scheduled.
|
||||
// The second element of the MethodArgs slice holds the timer defined in seconds.
|
||||
func (m methodREQHttpGetScheduled) handler(proc process, message Message, node string) ([]byte, error) {
|
||||
log.Printf("<--- REQHttpGetScheduled received from: %v, containing: %v", message.FromNode, message.Data)
|
||||
inf := fmt.Errorf("<--- REQHttpGetScheduled received from: %v, containing: %v", message.FromNode, message.Data)
|
||||
proc.processes.errorKernel.logConsoleOnlyIfDebug(inf, proc.configuration)
|
||||
|
||||
proc.processes.wg.Add(1)
|
||||
go func() {
|
||||
|
@ -1463,7 +1461,7 @@ func (m methodREQHttpGetScheduled) handler(proc process, message Message, node s
|
|||
case len(message.MethodArgs) < 3:
|
||||
er := fmt.Errorf("error: methodREQHttpGet: got <3 number methodArgs. Want URL, Schedule Interval in seconds, and the total time in minutes the scheduler should run for")
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -1542,7 +1540,6 @@ func (m methodREQHttpGetScheduled) handler(proc process, message Message, node s
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: methodREQHttpGet: io.ReadAll failed : %v, methodArgs: %v", err, message.MethodArgs)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
}
|
||||
|
||||
out := body
|
||||
|
@ -1602,7 +1599,8 @@ func (m methodREQTailFile) getKind() Event {
|
|||
// return the output of the command run back to the calling publisher
|
||||
// as a new message.
|
||||
func (m methodREQTailFile) handler(proc process, message Message, node string) ([]byte, error) {
|
||||
log.Printf("<--- TailFile REQUEST received from: %v, containing: %v", message.FromNode, message.Data)
|
||||
inf := fmt.Errorf("<--- TailFile REQUEST received from: %v, containing: %v", message.FromNode, message.Data)
|
||||
proc.processes.errorKernel.logConsoleOnlyIfDebug(inf, proc.configuration)
|
||||
|
||||
proc.processes.wg.Add(1)
|
||||
go func() {
|
||||
|
@ -1612,7 +1610,7 @@ func (m methodREQTailFile) handler(proc process, message Message, node string) (
|
|||
case len(message.MethodArgs) < 1:
|
||||
er := fmt.Errorf("error: methodREQTailFile: got <1 number methodArgs")
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -1638,7 +1636,6 @@ func (m methodREQTailFile) handler(proc process, message Message, node string) (
|
|||
}})
|
||||
if err != nil {
|
||||
er := fmt.Errorf("error: methodREQToTailFile: tailFile: %v", err)
|
||||
log.Printf("%v\n", er)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
}
|
||||
|
||||
|
@ -1696,7 +1693,8 @@ func (m methodREQCliCommandCont) getKind() Event {
|
|||
// longer time and you want to send the output of the command continually
|
||||
// back as it is generated, and not just when the command is finished.
|
||||
func (m methodREQCliCommandCont) handler(proc process, message Message, node string) ([]byte, error) {
|
||||
log.Printf("<--- CLInCommandCont REQUEST received from: %v, containing: %v", message.FromNode, message.Data)
|
||||
inf := fmt.Errorf("<--- CLInCommandCont REQUEST received from: %v, containing: %v", message.FromNode, message.Data)
|
||||
proc.processes.errorKernel.logConsoleOnlyIfDebug(inf, proc.configuration)
|
||||
|
||||
// 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
|
||||
|
@ -1716,7 +1714,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.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
return
|
||||
case len(message.MethodArgs) >= 0:
|
||||
a = message.MethodArgs[1:]
|
||||
|
@ -1744,21 +1742,17 @@ 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.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("error: %v\n", er)
|
||||
}
|
||||
|
||||
ErrorReader, err := cmd.StderrPipe()
|
||||
if err != nil {
|
||||
er := fmt.Errorf("error: methodREQCliCommandCont: cmd.StderrPipe failed : %v, methodArgs: %v", err, message.MethodArgs)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
}
|
||||
|
||||
if err := cmd.Start(); err != nil {
|
||||
er := fmt.Errorf("error: methodREQCliCommandCont: cmd.Start failed : %v, methodArgs: %v", err, message.MethodArgs)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
}
|
||||
|
||||
go func() {
|
||||
|
@ -1872,7 +1866,7 @@ func (m methodREQRelayInitial) handler(proc process, message Message, node strin
|
|||
case len(message.MethodArgs) < 3:
|
||||
er := fmt.Errorf("error: methodREQRelayInitial: got <3 number methodArgs: want srcfilePath,dstNode,dstFilePath")
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -1930,7 +1924,6 @@ func (m methodREQRelayInitial) handler(proc process, message Message, node strin
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: newSubjectAndMessage : %v, message: %v", err, message)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
}
|
||||
|
||||
proc.toRingbufferCh <- []subjectAndMessage{sam}
|
||||
|
@ -1967,7 +1960,7 @@ func (m methodREQRelay) handler(proc process, message Message, node string) ([]b
|
|||
if err != nil {
|
||||
er := fmt.Errorf("error: newSubjectAndMessage : %v, message: %v", err, message)
|
||||
proc.processes.errorKernel.errSend(proc, message, er)
|
||||
log.Printf("%v\n", er)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
@ -170,7 +170,8 @@ func NewServer(configuration *Configuration, version string) (*server, error) {
|
|||
return nil, fmt.Errorf("error: failed to create data folder directory %v: %v", configuration.SubscribersDataFolder, err)
|
||||
}
|
||||
|
||||
log.Printf("info: Creating subscribers data folder at %v\n", configuration.SubscribersDataFolder)
|
||||
er := fmt.Errorf("info: creating subscribers data folder at %v", configuration.SubscribersDataFolder)
|
||||
s.errorKernel.logConsoleOnlyIfDebug(er, s.configuration)
|
||||
}
|
||||
|
||||
return s, nil
|
||||
|
|
Loading…
Add table
Reference in a new issue