mirror of
https://github.com/hibiken/asynqmon.git
synced 2025-01-18 18:55:54 +08:00
Show started time in ActiveTasksTable
This commit is contained in:
parent
1eafcbeed5
commit
c08addc7b3
@ -89,6 +89,13 @@ type BaseTask struct {
|
||||
|
||||
type ActiveTask struct {
|
||||
*BaseTask
|
||||
|
||||
// Started time indicates when a worker started working on ths task.
|
||||
//
|
||||
// Value is either time formatted in RFC3339 format, or "-" which indicates
|
||||
// a worker started working on the task only a few moments ago, and started time
|
||||
// data is not available.
|
||||
Started string `json:"start_time"`
|
||||
}
|
||||
|
||||
func toActiveTask(t *asynq.ActiveTask) *ActiveTask {
|
||||
@ -98,7 +105,7 @@ func toActiveTask(t *asynq.ActiveTask) *ActiveTask {
|
||||
Payload: t.Payload,
|
||||
Queue: t.Queue,
|
||||
}
|
||||
return &ActiveTask{base}
|
||||
return &ActiveTask{BaseTask: base}
|
||||
}
|
||||
|
||||
func toActiveTasks(in []*asynq.ActiveTask) []*ActiveTask {
|
||||
|
@ -5,6 +5,7 @@ import (
|
||||
"log"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/gorilla/mux"
|
||||
"github.com/hibiken/asynq"
|
||||
@ -15,11 +16,17 @@ import (
|
||||
// - http.Handler(s) for task related endpoints
|
||||
// ****************************************************************************
|
||||
|
||||
type ListActiveTasksResponse struct {
|
||||
Tasks []*ActiveTask `json:"tasks"`
|
||||
Stats *QueueStateSnapshot `json:"stats"`
|
||||
}
|
||||
|
||||
func newListActiveTasksHandlerFunc(inspector *asynq.Inspector) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
vars := mux.Vars(r)
|
||||
qname := vars["qname"]
|
||||
pageSize, pageNum := getPageOptions(r)
|
||||
|
||||
tasks, err := inspector.ListActiveTasks(
|
||||
qname, asynq.PageSize(pageSize), asynq.Page(pageNum))
|
||||
if err != nil {
|
||||
@ -31,15 +38,35 @@ func newListActiveTasksHandlerFunc(inspector *asynq.Inspector) http.HandlerFunc
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
payload := make(map[string]interface{})
|
||||
if len(tasks) == 0 {
|
||||
// avoid nil for the tasks field in json output.
|
||||
payload["tasks"] = make([]*ActiveTask, 0)
|
||||
} else {
|
||||
payload["tasks"] = toActiveTasks(tasks)
|
||||
servers, err := inspector.Servers()
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
payload["stats"] = toQueueStateSnapshot(stats)
|
||||
if err := json.NewEncoder(w).Encode(payload); err != nil {
|
||||
// m maps taskID to started time.
|
||||
m := make(map[string]time.Time)
|
||||
for _, srv := range servers {
|
||||
for _, w := range srv.ActiveWorkers {
|
||||
if w.Task.Queue == qname {
|
||||
m[w.Task.ID] = w.Started
|
||||
}
|
||||
}
|
||||
}
|
||||
activeTasks := toActiveTasks(tasks)
|
||||
for _, t := range activeTasks {
|
||||
started, ok := m[t.ID]
|
||||
if ok {
|
||||
t.Started = started.Format(time.RFC3339)
|
||||
} else {
|
||||
t.Started = "-"
|
||||
}
|
||||
}
|
||||
|
||||
resp := ListActiveTasksResponse{
|
||||
Tasks: activeTasks,
|
||||
Stats: toQueueStateSnapshot(stats),
|
||||
}
|
||||
if err := json.NewEncoder(w).Encode(resp); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
@ -243,6 +243,7 @@ interface BaseTask {
|
||||
export interface ActiveTask extends BaseTask {
|
||||
id: string;
|
||||
queue: string;
|
||||
start_time: string;
|
||||
}
|
||||
|
||||
export interface PendingTask extends BaseTask {
|
||||
|
@ -37,7 +37,7 @@ import TablePaginationActions, {
|
||||
import TableActions from "./TableActions";
|
||||
import { usePolling } from "../hooks";
|
||||
import { ActiveTaskExtended } from "../reducers/tasksReducer";
|
||||
import { uuidPrefix } from "../utils";
|
||||
import { timeAgo, uuidPrefix } from "../utils";
|
||||
import { TableColumn } from "../types/table";
|
||||
|
||||
const useStyles = makeStyles((theme) => ({
|
||||
@ -66,6 +66,15 @@ const mapDispatchToProps = {
|
||||
cancelAllActiveTasksAsync,
|
||||
};
|
||||
|
||||
const columns: TableColumn[] = [
|
||||
{ key: "icon", label: "", align: "left" },
|
||||
{ key: "id", label: "ID", align: "left" },
|
||||
{ key: "type", label: "Type", align: "left" },
|
||||
{ key: "status", label: "Status", align: "left" },
|
||||
{ key: "start-time", label: "Started", align: "left" },
|
||||
{ key: "actions", label: "Actions", align: "center" },
|
||||
];
|
||||
|
||||
const connector = connect(mapStateToProps, mapDispatchToProps);
|
||||
|
||||
type ReduxProps = ConnectedProps<typeof connector>;
|
||||
@ -131,14 +140,6 @@ function ActiveTasksTable(props: Props & ReduxProps) {
|
||||
);
|
||||
}
|
||||
|
||||
const columns: TableColumn[] = [
|
||||
{ key: "icon", label: "", align: "left" },
|
||||
{ key: "id", label: "ID", align: "left" },
|
||||
{ key: "type", label: "Type", align: "left" },
|
||||
{ key: "status", label: "Status", align: "left" },
|
||||
{ key: "actions", label: "Actions", align: "center" },
|
||||
];
|
||||
|
||||
const rowCount = props.tasks.length;
|
||||
const numSelected = selectedIds.length;
|
||||
return (
|
||||
@ -294,6 +295,9 @@ function Row(props: RowProps) {
|
||||
</TableCell>
|
||||
<TableCell>{task.type}</TableCell>
|
||||
<TableCell>{task.canceling ? "Canceling" : "Running"}</TableCell>
|
||||
<TableCell>
|
||||
{task.start_time === "-" ? "just now" : timeAgo(task.start_time)}
|
||||
</TableCell>
|
||||
<TableCell
|
||||
align="center"
|
||||
onMouseEnter={props.onActionCellEnter}
|
||||
@ -319,7 +323,10 @@ function Row(props: RowProps) {
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
<TableRow selected={props.isSelected}>
|
||||
<TableCell style={{ paddingBottom: 0, paddingTop: 0 }} colSpan={6}>
|
||||
<TableCell
|
||||
style={{ paddingBottom: 0, paddingTop: 0 }}
|
||||
colSpan={columns.length + 1}
|
||||
>
|
||||
<Collapse in={open} timeout="auto" unmountOnExit>
|
||||
<Box margin={1}>
|
||||
<Typography variant="h6" gutterBottom component="div">
|
||||
|
Loading…
Reference in New Issue
Block a user