schiwagoa/tianji
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix a bug which can not raise monitor with changeActive if monitor never run before

Browse Source 
the case of init state is stop. (active: false)

and add workspace id validate in update logic
This commit is contained in:
moonrailgun 2024-01-03 01:52:06 +08:00
parent df01dcb857
commit e38df2706e
2 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/model/monitor/manager.ts
View File

@ -23,12 +23,13 @@ export class MonitorManager {
*/
async upsert(data: MonitorUpsertData): Promise<MonitorWithNotification> {
let monitor: MonitorWithNotification;
const { id, notificationIds = [], ...others } = data;
const { id, workspaceId, notificationIds = [], ...others } = data;
if (id) {
// update
monitor = await prisma.monitor.update({
where: {
id,
workspaceId,
},
data: {
...others,
@ -45,6 +46,7 @@ export class MonitorManager {
monitor = await prisma.monitor.create({
data: {
...others,
workspaceId,
notifications: {
connect: notificationIds.map((id) => ({ id })),
},
@ -124,4 +126,12 @@ export class MonitorManager {
getRunner(monitorId: string): MonitorRunner | undefined {
return this.monitorRunner[monitorId];
}
createRunner(monitor: MonitorWithNotification) {
const runner = (this.monitorRunner[monitor.id] = new MonitorRunner(
monitor
));
return runner;
}
}

37
src/server/trpc/routers/monitor.ts
View File

@ -251,7 +251,7 @@ export const monitorRouter = router({
})
)
.output(monitorInfoSchema)
.mutation(async ({ input, ctx }) => {
.mutation(async ({ input }) => {
const { workspaceId, monitorId, active } = input;
const monitor = await prisma.monitor.update({
@ -262,22 +262,27 @@ export const monitorRouter = router({
data: {
active,
},
include: {
notifications: true,
},
});
const runner = monitorManager.getRunner(monitorId);
if (runner) {
if (active === true) {
runner.startMonitor();
runner.createEvent(
'UP',
`Monitor [${monitor.name}] has been manual start`
);
} else {
runner.stopMonitor();
runner.createEvent(
'DOWN',
`Monitor [${monitor.name}] has been manual stop`
);
}
let runner = monitorManager.getRunner(monitorId);
if (!runner) {
runner = monitorManager.createRunner(monitor);
}
if (active === true) {
runner.startMonitor();
runner.createEvent(
'UP',
`Monitor [${monitor.name}] has been manual start`
);
} else {
runner.stopMonitor();
runner.createEvent(
'DOWN',
`Monitor [${monitor.name}] has been manual stop`
);
}
return monitor;