PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Improve logging in SessionLock (#133)

Browse source 
some more diagnostics for this, to help resolve
https://github.com/element-hq/element-desktop/issues/1495
This commit is contained in:
Richard van der Hoff 2024-10-09 15:38:53 +01:00 committed by GitHub
parent df4a223eb6
commit b79343d5b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/utils/SessionLock.ts
View file

@ -66,15 +66,29 @@ export const SESSION_LOCK_CONSTANTS = {
* @returns true if any instance is currently active * @returns true if any instance is currently active
*/ */
export function checkSessionLockFree(): boolean { export function checkSessionLockFree(): boolean {
const prefixedLogger = logger.getChild(`checkSessionLockFree`);
const lastPingTime = window.localStorage.getItem(SESSION_LOCK_CONSTANTS.STORAGE_ITEM_PING); const lastPingTime = window.localStorage.getItem(SESSION_LOCK_CONSTANTS.STORAGE_ITEM_PING);
if (lastPingTime === null) { if (lastPingTime === null) {
// no other holder // no other holder
prefixedLogger.info("No other session has the lock");
return true; return true;
} }
const lockHolder = window.localStorage.getItem(SESSION_LOCK_CONSTANTS.STORAGE_ITEM_OWNER);
// see if it has expired // see if it has expired
const timeAgo = Date.now() - parseInt(lastPingTime); const timeAgo = Date.now() - parseInt(lastPingTime);
return timeAgo > SESSION_LOCK_CONSTANTS.LOCK_EXPIRY_TIME_MS;
const remaining = SESSION_LOCK_CONSTANTS.LOCK_EXPIRY_TIME_MS - timeAgo;
if (remaining <= 0) {
// another session claimed the lock, but it is stale.
prefixedLogger.info(`Last ping (from ${lockHolder}) was ${timeAgo}ms ago: lock is free`);
return true;
}
prefixedLogger.info(`Last ping (from ${lockHolder}) was ${timeAgo}ms ago: lock is taken`);
return false;
} }
/** /**
@ -95,7 +109,7 @@ export async function getSessionLock(onNewInstance: () => Promise<void>): Promis
/** unique ID for this session */ /** unique ID for this session */
const sessionIdentifier = uuidv4(); const sessionIdentifier = uuidv4();
const prefixedLogger = logger.withPrefix(`getSessionLock[${sessionIdentifier}]`); const prefixedLogger = logger.getChild(`getSessionLock[${sessionIdentifier}]`);
/** The ID of our regular task to service the lock. /** The ID of our regular task to service the lock.
* *
@ -133,7 +147,7 @@ export async function getSessionLock(onNewInstance: () => Promise<void>): Promis
return 0; return 0;
} }
prefixedLogger.info(`Last ping (from ${lockHolder}) was ${timeAgo}ms ago, waiting`); prefixedLogger.info(`Last ping (from ${lockHolder}) was ${timeAgo}ms ago, waiting ${remaining}ms`);
return remaining; return remaining;
} }