Jannex
/
robot-control-manager
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

start and end log message

main
alex 2023-10-23 21:57:12 +02:00
parent 75f4d5ef99
commit 686df6975a
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main.go
View File

@ -39,6 +39,9 @@ COLORIZED_OUTPUT=true
HOST=127.0.0.1 HOST=127.0.0.1
PORT=8080 PORT=8080
LOG_MANAGER_SERVER_URL=http://localhost:50110
SSE_SERVER_ENABLED=true
# MariaDB # MariaDB
MARIADB_HOSTNAME=127.0.0.1 MARIADB_HOSTNAME=127.0.0.1
MARIADB_PORT=3306 MARIADB_PORT=3306

4
modules/robot/robot.go
View File

@ -183,6 +183,10 @@ func UpdateRobotCurrentJob(r *structs.Robot, jobId string, jobName string) {
return return
} */ } */
if r.CurrentJobId != jobId && jobId != "" {
logger.AddRobotLog(rslogger.LogTypeInfo, utils.RobotTypeRex, r.Id, "------ Start job id: %v name: %v ------", jobId, jobName)
}
r.CurrentJobId = jobId r.CurrentJobId = jobId
r.CurrentJobName = jobName r.CurrentJobName = jobName

7
routers/api/v1/control/control.go
View File

@ -12,6 +12,7 @@ import (
"git.ex.umbach.dev/Alex/roese-utils/rslogger" "git.ex.umbach.dev/Alex/roese-utils/rslogger"
"git.ex.umbach.dev/Alex/roese-utils/rsutils" "git.ex.umbach.dev/Alex/roese-utils/rsutils"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
"github.com/rs/zerolog/log"
) )
func ControlRex(c *fiber.Ctx) error { func ControlRex(c *fiber.Ctx) error {
@ -114,11 +115,15 @@ func FinishControlRex(c *fiber.Ctx) error {
return c.SendStatus(fiber.StatusUnprocessableEntity) return c.SendStatus(fiber.StatusUnprocessableEntity)
} }
lastJobName := r.CurrentJobName
robot.UpdateRobotCurrentJob(r, "", "") robot.UpdateRobotCurrentJob(r, "", "")
robot.CountDownJobsWaiting(r) robot.CountDownJobsWaiting(r)
robot.UpdateRobotStatus(r, utils.RobotStatusIdle) robot.UpdateRobotStatus(r, utils.RobotStatusIdle)
logger.AddRobotLog(rslogger.LogTypeInfo, utils.RobotTypeRex, r.Id, "Finish control robot") log.Info().Msgf("finish %v %v", body, r)
logger.AddRobotLog(rslogger.LogTypeInfo, utils.RobotTypeRex, r.Id, "------ Finished job id: %s name: %s ------", body.JobId, lastJobName)
return c.SendStatus(fiber.StatusOK) return c.SendStatus(fiber.StatusOK)
} }

5
testclient/testrobot.py
View File

@ -33,7 +33,7 @@ def randomId():
# 10 random rexrobot # 10 random rexrobot
RexRobot("test") RexRobot("test")
RexRobot("759") #RexRobot("759")
''' '''
for i in range(1): for i in range(1):
#RexRobot(str(randomId())) #RexRobot(str(randomId()))
@ -57,8 +57,7 @@ def hello():
print("controlling robot", body) print("controlling robot", body)
time.sleep(3) time.sleep(1)
print("robot controlled") print("robot controlled")