Compare commits

...

3 commits

Author SHA1 Message Date
Gustavo Valverde
137b09da84
Merge 79895d455a into 277d6fe0ce 2024-10-27 12:30:58 +00:00
Louis Lam
277d6fe0ce
Fix #5087 and fix migration state (#5260)
Some checks failed
Auto Test / auto-test (18, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (18, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, windows-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (20, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, windows-latest) (push) Blocked by required conditions
Auto Test / armv7-simple-test (18, ARMv7) (push) Waiting to run
Auto Test / armv7-simple-test (20, ARMv7) (push) Waiting to run
Auto Test / check-linters (push) Waiting to run
Auto Test / e2e-test (push) Waiting to run
CodeQL / Analyze (push) Waiting to run
Merge Conflict Labeler / Labeling (push) Waiting to run
json-yaml-validate / json-yaml-validate (push) Has been cancelled
json-yaml-validate / check-lang-json (push) Has been cancelled
2024-10-27 20:30:44 +08:00
Gustavo Valverde
79895d455a
fix(db): increase the DNS allowed response size
Some DNS servers might reply with several IP addresses. This avoids errors like the following:

```
Failing: UPDATE `monitor` SET dns_last_result = 'Records: X' WHERE id = 1  - Data too long for column 'dns_last_result' at row 1
```
2024-07-11 13:35:09 +01:00
3 changed files with 16 additions and 3 deletions

View file

@ -86,7 +86,7 @@ async function createTables() {
table.text("accepted_statuscodes_json").notNullable().defaultTo("[\"200-299\"]");
table.string("dns_resolve_type", 5);
table.string("dns_resolve_server", 255);
table.string("dns_last_result", 255);
table.string("dns_last_result", 2000);
table.integer("retry_interval").notNullable().defaultTo(0);
table.string("push_token", 20).defaultTo(null);
table.text("method").notNullable().defaultTo("GET");

View file

@ -0,0 +1,13 @@
// Update info_json column to LONGTEXT mainly for MariaDB
exports.up = function (knex) {
return knex.schema
.alterTable("monitor_tls_info", function (table) {
table.text("info_json", "longtext").alter();
});
};
exports.down = function (knex) {
return knex.schema.alterTable("monitor_tls_info", function (table) {
table.text("info_json", "text").alter();
});
};

View file

@ -775,8 +775,6 @@ class Database {
await migrationServer.start(port, hostname);
}
await Settings.set("migrateAggregateTableState", "migrating");
log.info("db", "Migrating Aggregate Table");
log.info("db", "Getting list of unique monitors");
@ -799,6 +797,8 @@ class Database {
}
}
await Settings.set("migrateAggregateTableState", "migrating");
let progressPercent = 0;
let part = 100 / monitors.length;
let i = 1;