From 686df6975a5fbddb1f4c369e6ca8b79b4fcf2d36 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 23 Oct 2023 21:57:12 +0200 Subject: [PATCH] start and end log message --- main.go | 3 +++ modules/robot/robot.go | 4 ++++ routers/api/v1/control/control.go | 7 ++++++- testclient/testrobot.py | 5 ++--- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/main.go b/main.go index eb0e10b..114525c 100644 --- a/main.go +++ b/main.go @@ -39,6 +39,9 @@ COLORIZED_OUTPUT=true HOST=127.0.0.1 PORT=8080 +LOG_MANAGER_SERVER_URL=http://localhost:50110 +SSE_SERVER_ENABLED=true + # MariaDB MARIADB_HOSTNAME=127.0.0.1 MARIADB_PORT=3306 diff --git a/modules/robot/robot.go b/modules/robot/robot.go index b05117c..53e5f1f 100644 --- a/modules/robot/robot.go +++ b/modules/robot/robot.go @@ -183,6 +183,10 @@ func UpdateRobotCurrentJob(r *structs.Robot, jobId string, jobName string) { 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.CurrentJobName = jobName diff --git a/routers/api/v1/control/control.go b/routers/api/v1/control/control.go index ccd0330..d5fab8e 100644 --- a/routers/api/v1/control/control.go +++ b/routers/api/v1/control/control.go @@ -12,6 +12,7 @@ import ( "git.ex.umbach.dev/Alex/roese-utils/rslogger" "git.ex.umbach.dev/Alex/roese-utils/rsutils" "github.com/gofiber/fiber/v2" + "github.com/rs/zerolog/log" ) func ControlRex(c *fiber.Ctx) error { @@ -114,11 +115,15 @@ func FinishControlRex(c *fiber.Ctx) error { return c.SendStatus(fiber.StatusUnprocessableEntity) } + lastJobName := r.CurrentJobName + robot.UpdateRobotCurrentJob(r, "", "") robot.CountDownJobsWaiting(r) 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) } diff --git a/testclient/testrobot.py b/testclient/testrobot.py index b0eebf5..fee0af6 100644 --- a/testclient/testrobot.py +++ b/testclient/testrobot.py @@ -33,7 +33,7 @@ def randomId(): # 10 random rexrobot RexRobot("test") -RexRobot("759") +#RexRobot("759") ''' for i in range(1): #RexRobot(str(randomId())) @@ -57,8 +57,7 @@ def hello(): print("controlling robot", body) - time.sleep(3) - + time.sleep(1) print("robot controlled")