github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

fix: enhance error handling in domain migration and log errors using Logger

Browse Source
This commit is contained in:
Simon Larsen
2025-05-29 15:15:56 +01:00
parent 14a70846d0
commit 6f99d71d7f
2 changed files with 53 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Common/Types/Domain.ts
View File

@@ -11,7 +11,7 @@ export default class Domain extends DatabaseProperty {
public set domain(v: string) {
const isValid: boolean = Domain.isValidDomain(v);
if (!isValid) {
throw new BadDataException("Domain is not in valid format.");
throw new BadDataException("Domain " + v + " is not in valid format.");
}
this._domain = v;
}

93
Worker/DataMigrations/LowercaseDomains.ts
View File

@@ -5,6 +5,7 @@ import DomainModel from "Common/Models/DatabaseModels/Domain";
import Domain from "Common/Types/Domain";
import StatusPageDomain from "Common/Models/DatabaseModels/StatusPageDomain";
import StatusPageDomainService from "Common/Server/Services/StatusPageDomainService";
import logger from "Common/Server/Utils/Logger";
export default class LowercaseDomains extends DataMigrationBase {
public constructor() {
@@ -26,38 +27,43 @@ export default class LowercaseDomains extends DataMigrationBase {
});
for (const domain of domains) {
let domainString: string | undefined = undefined;
try {
let domainString: string | undefined = undefined;
if (domain.domain instanceof Domain) {
domainString = domain.domain.domain;
if (domain.domain instanceof Domain) {
domainString = domain.domain.domain;
}
// if string
if (typeof domain.domain === "string") {
domainString = domain.domain;
}
// Lowercase the domain
if (!domainString) {
continue;
}
domainString = domainString.toLowerCase().trim();
// Update the domain
await DomainService.updateOneBy({
query: {
_id: domain._id,
},
data: {
domain: new Domain(domainString),
},
props: {
isRoot: true,
},
});
} catch (err) {
logger.error("Error updating domain:");
logger.error(err);
}
// if string
if (typeof domain.domain === "string") {
domainString = domain.domain;
}
// Lowercase the domain
if (!domainString) {
continue;
}
domainString = domainString.toLowerCase().trim();
// Update the domain
await DomainService.updateOneBy({
query: {
_id: domain._id,
},
data: {
domain: new Domain(domainString),
},
props: {
isRoot: true,
},
});
}
// now get status page domains and lowercase them as well
@@ -77,17 +83,22 @@ export default class LowercaseDomains extends DataMigrationBase {
});
for (const statusPageDomain of statusPageDomains) {
// update one by one
await StatusPageDomainService.updateOneById({
id: statusPageDomain.id!,
data: {
fullDomain: statusPageDomain.fullDomain?.toLowerCase().trim() || "",
subdomain: statusPageDomain.subdomain?.toLowerCase().trim() || "",
},
props: {
isRoot: true,
},
});
try {
// update one by one
await StatusPageDomainService.updateOneById({
id: statusPageDomain.id!,
data: {
fullDomain: statusPageDomain.fullDomain?.toLowerCase().trim() || "",
subdomain: statusPageDomain.subdomain?.toLowerCase().trim() || "",
},
props: {
isRoot: true,
},
});
} catch (err) {
logger.error("Error updating status page domain:");
logger.error(err);
}
}
}