self-hosted/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-01-02 00:10:42 +02:00
Code Issues Actions 1 Releases Activity

Merge branch 'master' into feat/status-page-summary-api

Browse Source
This commit is contained in:
Gero Gerke 2024-12-13 16:41:37 +01:00 committed by GitHub
commit 0b21ed1acd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "uptime-kuma", "name": "uptime-kuma",
"version": "2.0.0-dev", "version": "2.0.0-beta.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "uptime-kuma", "name": "uptime-kuma",
"version": "2.0.0-dev", "version": "2.0.0-beta.0",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@grpc/grpc-js": "~1.8.22", "@grpc/grpc-js": "~1.8.22",

2
server/database.js
View File

@ -892,11 +892,13 @@ class Database {
AND important = 0 AND important = 0
AND time < ${sqlHourOffset} AND time < ${sqlHourOffset}
AND id NOT IN ( AND id NOT IN (
SELECT id FROM ( -- written this way for Maria's support
SELECT id SELECT id
FROM heartbeat FROM heartbeat
WHERE monitor_id = ? WHERE monitor_id = ?
ORDER BY time DESC ORDER BY time DESC
LIMIT ? LIMIT ?
) AS limited_ids
) )
`, [ `, [
monitor.id, monitor.id,