Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions api/clickhouse-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
CLICKHOUSE_USER,
} from './lib/env.ts'
import { respond } from '@01edu/api/response'
import { log } from './lib/log.ts'
import {
ARR,
type Asserted,
Expand Down Expand Up @@ -100,13 +99,13 @@ async function insertLogs(
}
})

log.debug('Inserting logs into ClickHouse', { rows })
console.debug('Inserting logs into ClickHouse', { rows })

try {
await client.insert({ table: 'logs', values: rows, format: 'JSONEachRow' })
return respond.OK()
} catch (error) {
log.error('Error inserting logs into ClickHouse:', { error })
console.error('Error inserting logs into ClickHouse:', { error })
throw respond.InternalServerError()
}
}
Expand Down Expand Up @@ -213,7 +212,7 @@ async function getLogs(dep: string, data: FetchTablesParams) {
})
return (await rs.json<Log>()).data
} catch (e) {
log.error('ClickHouse query failed', { error: e, query, params })
console.error('ClickHouse query failed', { error: e, query, params })
throw respond.InternalServerError()
}
}
Expand Down
2 changes: 0 additions & 2 deletions api/lib/log.ts

This file was deleted.

6 changes: 3 additions & 3 deletions api/routes.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { makeRouter, route } from '@01edu/api/router'
import type { RequestContext } from '@01edu/api/context'
import { handleGoogleCallback, initiateGoogleAuth } from '/api/auth.ts'
import { log } from '/api/lib/log.ts'
import {
DatabaseSchemasCollection,
DeploymentDef,
Expand All @@ -24,6 +23,7 @@ import {
} from '/api/clickhouse-client.ts'
import { decodeSession, decryptMessage, encryptMessage } from '/api/user.ts'
import { fetchTablesData, runSQL, SQLQueryError } from '/api/sql.ts'
import { Log } from '@01edu/api/log'

const withUserSession = async ({ cookies }: RequestContext) => {
const session = await decodeSession(cookies.session)
Expand Down Expand Up @@ -472,7 +472,7 @@ const defs = {
columnsMap,
)
} catch (err) {
log.error('fetchTablesData-error', { stack: (err as Error)?.stack })
console.error('fetchTablesData-error', { stack: (err as Error)?.stack })
throw err
}
},
Expand Down Expand Up @@ -574,4 +574,4 @@ const defs = {
} as const

export type RouteDefinitions = typeof defs
export const routeHandler = makeRouter(log, defs)
export const routeHandler = makeRouter(console as unknown as Log, defs)
6 changes: 3 additions & 3 deletions api/server.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { serveDir } from '@std/http/file-server'
import { APP_ENV } from '@01edu/api/env'
import { server } from '@01edu/api/server'
import { log } from '/api/lib/log.ts'
import { Log } from '@01edu/api/log'
import { routeHandler } from '/api/routes.ts'
import { PORT } from './lib/env.ts'

const fetch = server({ log, routeHandler })
const fetch = server({ log: console as unknown as Log, routeHandler })
export default {
fetch(req: Request) {
return fetch(req, new URL(req.url))
Expand All @@ -27,5 +27,5 @@ if (APP_ENV === 'prod') {
return new Response(indexHtml, htmlContent)
})
} else {
log.info('server-start')
console.info('server-start')
}
9 changes: 4 additions & 5 deletions api/sql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
DeploymentsCollection,
} from '/api/schema.ts'
import { DB_SCHEMA_REFRESH_MS } from '/api/lib/env.ts'
import { log } from '/api/lib/log.ts'

export class SQLQueryError extends Error {
constructor(message: string, body: string) {
Expand Down Expand Up @@ -58,7 +57,7 @@ async function detectDialect(endpoint: string, token: string): Promise<string> {
for (const d of DETECTION_QUERIES) {
try {
const rows = await runSQL(endpoint, token, d.sql)
log.debug('dialect-detection', { dialect: d.name, rows })
console.debug('dialect-detection', { dialect: d.name, rows })
if (rows.length) {
const text = JSON.stringify(rows[0])
if (d.matcher.test(text)) return d.name
Expand Down Expand Up @@ -135,13 +134,13 @@ export async function refreshOneSchema(
} else {
await DatabaseSchemasCollection.insert(payload)
}
log.info('schema-refreshed', {
console.info('schema-refreshed', {
deployment: dep.url,
dialect,
tables: tables.length,
})
} catch (err) {
log.error('schema-refresh-failed', { deployment: dep.url, err })
console.error('schema-refresh-failed', { deployment: dep.url, err })
}
}

Expand All @@ -159,7 +158,7 @@ export function startSchemaRefreshLoop() {
intervalHandle = setInterval(() => {
refreshAllSchemas()
}, DB_SCHEMA_REFRESH_MS) as unknown as number
log.info('schema-refresh-loop-started', { everyMs: DB_SCHEMA_REFRESH_MS })
console.info('schema-refresh-loop-started', { everyMs: DB_SCHEMA_REFRESH_MS })
}

type FetchTablesParams = {
Expand Down
3 changes: 3 additions & 0 deletions deno.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions tasks/clickhouse.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { client } from '/api/clickhouse-client.ts'
import { log } from '/api/lib/log.ts'

if (import.meta.main) {
try {
Expand Down Expand Up @@ -39,9 +38,9 @@ if (import.meta.main) {
`,
})

log.info('logs table is ready')
console.log('logs table is ready')
} catch (error) {
log.error('Error creating ClickHouse table:', { error })
console.error('Error creating ClickHouse table:', { error })
Deno.exit(1)
}
}
Loading
Loading