Skip to content

Commit 41b3b46

Browse files
author
deepshekhardas
committed
fix: org-scoped ClickHouse issues
- Remove unused schema fields (keepAliveEnabled, keepAliveIdleSocketTtl, maxOpenConnections) - Move ClickHouse lookup inside deferred error handling in logs route These fixes address review comments from PR triggerdotdev#3333.
1 parent fbddd28 commit 41b3b46

2 files changed

Lines changed: 18 additions & 20 deletions

File tree

‎apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs/route.tsx‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -133,26 +133,27 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
133133
const from = fromStr ? parseInt(fromStr, 10) : undefined;
134134
const to = toStr ? parseInt(toStr, 10) : undefined;
135135

136-
// Get the user's plan to determine log retention limit
136+
// Get the user's plan to determine log retention limit
137137
const plan = await getCurrentPlan(project.organizationId);
138138
const retentionLimitDays = plan?.v3Subscription?.plan?.limits.logRetentionDays.number ?? 30;
139139

140-
const logsClickhouse = await clickhouseFactory.getClickhouseForOrganization(project.organizationId, "logs");
141-
const presenter = new LogsListPresenter($replica, logsClickhouse);
142-
143-
const listPromise = presenter
144-
.call(project.organizationId, environment.id, {
145-
userId,
146-
projectId: project.id,
147-
tasks: tasks.length > 0 ? tasks : undefined,
148-
runId,
149-
search,
150-
levels,
151-
period,
152-
from,
153-
to,
154-
defaultPeriod: "1h",
155-
retentionLimitDays,
140+
const listPromise = clickhouseFactory
141+
.getClickhouseForOrganization(project.organizationId, "logs")
142+
.then((logsClickhouse) => {
143+
const presenter = new LogsListPresenter($replica, logsClickhouse);
144+
return presenter.call(project.organizationId, environment.id, {
145+
userId,
146+
projectId: project.id,
147+
tasks: tasks.length > 0 ? tasks : undefined,
148+
runId,
149+
search,
150+
levels,
151+
period,
152+
from,
153+
to,
154+
defaultPeriod: "1h",
155+
retentionLimitDays,
156+
});
156157
})
157158
.catch((error) => {
158159
if (error instanceof ServiceValidationError) {

‎apps/webapp/app/routes/admin.api.v1.runs-replication.create.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ import {
1111

1212
const CreateRunReplicationServiceParams = z.object({
1313
name: z.string(),
14-
keepAliveEnabled: z.boolean(),
15-
keepAliveIdleSocketTtl: z.number(),
16-
maxOpenConnections: z.number(),
1714
maxFlushConcurrency: z.number(),
1815
flushIntervalMs: z.number(),
1916
flushBatchSize: z.number(),

0 commit comments

Comments
 (0)