Merge pull request #773 from signal18/jobs

fix wrong values of start and end
signal18 · Jul 27, 2024 · a4d3986 · a4d3986
2 parents 6f275fa + f8221e3
commit a4d3986
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,6 @@ build*
 maxscale*.rpm
 .idea
 googleapis/
+.vscode/
+.vscode-server/
+.cache/
diff --git a/cluster/srv_job.go b/cluster/srv_job.go
@@ -117,13 +117,14 @@ func (server *ServerMonitor) JobsUpdateEntries() error {
 	}
 
 	server.SetLoadingJobList(true)
+	server.SetNeedRefreshJobs(false)
 	defer server.SetLoadingJobList(false)
 
 	if server.IsDown() {
 		return errors.New("Node is down")
 	}
 
-	query := "SELECT id, task, port, server, done, state, result, UNIX_TIMESTAMP(start) utc_start, UNIX_TIMESTAMP(end) utc_end FROM replication_manager_schema.jobs"
+	query := "SELECT id, task, port, server, done, state, result, floor(UNIX_TIMESTAMP(start)) start, floor(UNIX_TIMESTAMP(end)) end FROM replication_manager_schema.jobs"
 
 	rows, err := server.Conn.Queryx(query)
 	if err != nil {
@@ -132,7 +133,6 @@ func (server *ServerMonitor) JobsUpdateEntries() error {
 		return err
 	}
 	defer rows.Close()
-	defer server.SetNeedRefreshJobs(false)
 
 	for rows.Next() {
 		var t config.Task