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 need for id with REQprocessStop

Browse source
This commit is contained in:
postmannen 2021-11-16 19:39:42 +01:00
parent 307695842f
commit c70b51e1fb
1 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
requests.go
View file

@ -44,7 +44,6 @@ import (
"os"
"os/exec"
"path/filepath"
"strconv"
"strings"
"time"
@ -626,30 +625,21 @@ func (m methodREQOpProcessStop) handler(proc process, message Message, node stri
// real method for the message.
var mt Method
if v := len(message.MethodArgs); v != 4 {
er := fmt.Errorf("error: OpProcessStop: methodArgs should contain 4 elements, found %v", v)
sendErrorLogMessage(proc.configuration, proc.processes.metrics, proc.toRingbufferCh, proc.node, er)
return
}
// --- Parse and check the method arguments given.
// The Reason for also having the node as one of the arguments is
// that publisher processes are named by the node they are sending the
// message to. Subscriber processes names are named by the node name
// they are running on.
switch {
case len(message.MethodArgs) != 4:
er := fmt.Errorf("error: methodREQCliCommand: got <4 number methodArgs, want: method,node,kind,id")
if v := len(message.MethodArgs); v != 3 {
er := fmt.Errorf("error: methodREQCliCommand: got <4 number methodArgs, want: method,node,kind")
sendErrorLogMessage(proc.configuration, proc.processes.metrics, proc.toRingbufferCh, proc.node, er)
log.Printf("%v\n", er)
return
}
methodString := message.MethodArgs[0]
node := message.MethodArgs[1]
kind := message.MethodArgs[2]
idString := message.MethodArgs[3]
method := Method(methodString)
tmpH := mt.getHandler(Method(method))
@ -659,15 +649,6 @@ func (m methodREQOpProcessStop) handler(proc process, message Message, node stri
return
}
// Check if id is a valid number.
id, err := strconv.Atoi(idString)
if err != nil {
er := fmt.Errorf("error: OpProcessStop: id: %v, is not a number, check that the methodArgs are correct: %v", idString, err)
sendErrorLogMessage(proc.configuration, proc.processes.metrics, proc.toRingbufferCh, proc.node, er)
log.Printf("%v\n", er)
return
}
// --- Find, and stop process if found
// Based on the arg values received in the message we create a
@ -697,7 +678,7 @@ func (m methodREQOpProcessStop) handler(proc process, message Message, node stri
// Remove the prometheus label
proc.processes.metrics.promProcessesAllRunning.Delete(prometheus.Labels{"processName": string(processName)})
txt := fmt.Sprintf("info: OpProcessStop: process stopped id: %v, method: %v on: %v", id, sub, message.ToNode)
txt := fmt.Sprintf("info: OpProcessStop: process stopped id: %v, method: %v on: %v", toStopProc.processID, sub, message.ToNode)
er := fmt.Errorf(txt)
sendErrorLogMessage(proc.configuration, proc.processes.metrics, proc.toRingbufferCh, proc.node, er)
log.Printf("%v\n", er)