lee/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-12-10 09:57:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'dev'
Some checks failed
Mark and Close Stale Issues / stale (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Owen
2025-10-17 16:25:01 -07:00
parent 6768672a44 240c5b005b
commit 40cd8cdec7
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/db/pg/schema/schema.ts
View File

@@ -126,7 +126,7 @@ export const targets = pgTable("targets", {
pathMatchType: text("pathMatchType"), // exact, prefix, regex pathMatchType: text("pathMatchType"), // exact, prefix, regex
rewritePath: text("rewritePath"), // if set, rewrites the path to this value before sending to the target rewritePath: text("rewritePath"), // if set, rewrites the path to this value before sending to the target
rewritePathType: text("rewritePathType"), // exact, prefix, regex, stripPrefix rewritePathType: text("rewritePathType"), // exact, prefix, regex, stripPrefix
priority: integer("priority").notNull().default(100) priority: integer("priority").default(100)
}); });
export const targetHealthCheck = pgTable("targetHealthCheck", { export const targetHealthCheck = pgTable("targetHealthCheck", {

2
server/db/sqlite/schema/schema.ts
View File

@@ -138,7 +138,7 @@ export const targets = sqliteTable("targets", {
pathMatchType: text("pathMatchType"), // exact, prefix, regex pathMatchType: text("pathMatchType"), // exact, prefix, regex
rewritePath: text("rewritePath"), // if set, rewrites the path to this value before sending to the target rewritePath: text("rewritePath"), // if set, rewrites the path to this value before sending to the target
rewritePathType: text("rewritePathType"), // exact, prefix, regex, stripPrefix rewritePathType: text("rewritePathType"), // exact, prefix, regex, stripPrefix
priority: integer("priority").notNull().default(100) priority: integer("priority").default(100)
}); });
export const targetHealthCheck = sqliteTable("targetHealthCheck", { export const targetHealthCheck = sqliteTable("targetHealthCheck", {

2
server/private/lib/traefik/getTraefikConfig.ts
View File

@@ -238,7 +238,7 @@ export async function getTraefikConfig(
} }
// get the valid certs for these domains // get the valid certs for these domains
validCerts = await getValidCertificatesForDomains(domains, true); // we are caching here because this is called often validCerts = await getValidCertificatesForDomains(domains, true); // we are caching here because this is called often
logger.debug(`Valid certs for domains: ${JSON.stringify(validCerts)}`); // logger.debug(`Valid certs for domains: ${JSON.stringify(validCerts)}`);
} }
const config_output: any = { const config_output: any = {

6
server/routers/gerbil/receiveBandwidth.ts
View File

@@ -149,7 +149,8 @@ export async function updateSiteBandwidth(
orgId, orgId,
true, true,
FeatureId.EGRESS_DATA_MB, FeatureId.EGRESS_DATA_MB,
bandwidthUsage bandwidthUsage,
trx
) )
.catch((error: any) => { .catch((error: any) => {
logger.error( logger.error(
@@ -175,7 +176,8 @@ export async function updateSiteBandwidth(
orgId, orgId,
true, true,
FeatureId.SITE_UPTIME, FeatureId.SITE_UPTIME,
uptimeUsage uptimeUsage,
trx
) )
.catch((error: any) => { .catch((error: any) => {
logger.error( logger.error(