Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

clean-up protocol, update getDatabaseType logic for CH

Francis Caoc6d0fde424c9
diff --git a/src/components/pages/reports/Report.js b/src/components/pages/reports/Report.js
index de17aca62..538a444da 100644
--- a/src/components/pages/reports/Report.js
+++ b/src/components/pages/reports/Report.js
@@ -8,8 +8,6 @@ export const ReportContext = createContext(null);
export function Report({ reportId, defaultParameters, children, ...props }) {
const report = useReport(reportId, defaultParameters);
- //console.log({ report });
-
return (
<ReportContext.Provider value={{ ...report }}>
<Page {...props} className={styles.container}>
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index c371e7f97..2eed340ed 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -25,16 +25,13 @@ function getClient() {
hostname,
port,
pathname,
- // protocol,
+ protocol,
username = 'default',
password,
} = new URL(process.env.CLICKHOUSE_URL);
- // const formattedProtocol =
- // protocol.toLowerCase() === 'clickhouse:' || protocol === 'https:' ? 'https:' : 'http:';
-
const client = createClient({
- host: `http://${hostname}:${port}`,
+ host: `${protocol}//${hostname}:${port}`,
database: pathname.replace('/', ''),
username: username,
password,
diff --git a/src/lib/db.js b/src/lib/db.js
index 750cdec07..6657ad979 100644
--- a/src/lib/db.js
+++ b/src/lib/db.js
@@ -17,6 +17,10 @@ export function getDatabaseType(url = process.env.DATABASE_URL) {
return POSTGRESQL;
}
+ if (process.env.CLICKHOUSE_URL) {
+ return CLICKHOUSE;
+ }
+
return type;
}