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.

Merge branch 'dev' of https://github.com/umami-software/umami into dev

Mike Cao580008cd090f
diff --cc src/lib/redis.ts
index 817299625,71a95a5ef..e8448eda9
--- a/src/lib/redis.ts
+++ b/src/lib/redis.ts
@@@ -4,40 -106,7 +106,40 @@@ const REDIS = 'redis'
const enabled = !!process.env.REDIS_URL;
function getClient() {
- const redis = new UmamiRedisClient({ url: process.env.REDIS_URL });
+ const redis = new UmamiRedisClient(process.env.REDIS_URL);
+ const originalConnect = redis.connect.bind(redis);
+ let connectPromise: Promise<void> | null = null;
+
+ const resetConnectionState = () => {
+ redis.isConnected = false;
+ };
+
+ redis.client.on('end', resetConnectionState);
+ redis.client.on('reconnecting', resetConnectionState);
+
+ redis.connect = async () => {
+ if (redis.client.isReady || redis.client.isOpen) {
+ redis.isConnected = true;
+ return;
+ }
+
+ if (connectPromise) {
+ return connectPromise;
+ }
+
+ connectPromise = (async () => {
+ try {
+ await originalConnect();
+ } catch (error) {
+ redis.isConnected = false;
+ throw error;
+ } finally {
+ connectPromise = null;
+ }
+ })();
+
+ return connectPromise;
+ };
if (process.env.NODE_ENV !== 'production') {
globalThis[REDIS] = redis;