oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

fix logging, allowOnlyOneAtATime fix timeout clearing

Browse source
This commit is contained in:
Ryan Tharp 2020-04-16 16:28:51 -07:00
parent 43b8b779f2
commit 158d6a2a2e
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
js/modules/loki_primitives.js
View file

@ -35,7 +35,7 @@ async function allowOnlyOneAtATime(name, process, timeout) {
if (timeout) {
timeoutTimer = setTimeout(() => {
log.warn(
`loki_snodes:::allowOnlyOneAtATime - TIMEDOUT after ${timeout}s`
`loki_primitives:::allowOnlyOneAtATime - TIMEDOUT after ${timeout}s`
);
delete snodeGlobalLocks[name]; // clear lock
reject();
@ -47,8 +47,16 @@ async function allowOnlyOneAtATime(name, process, timeout) {
innerRetVal = await process();
} catch (e) {
log.error(
`loki_snodes:::allowOnlyOneAtATime - error ${e.code} ${e.message}`
`loki_primitives:::allowOnlyOneAtATime - error ${e.code} ${e.message}`
);
// clear timeout timer
if (timeout) {
if (timeoutTimer !== null) {
clearTimeout(timeoutTimer);
timeoutTimer = null;
}
}
delete snodeGlobalLocks[name]; // clear lock
throw e;
}
// clear timeout timer
@ -69,7 +77,11 @@ async function allowOnlyOneAtATime(name, process, timeout) {
outerRetval = await snodeGlobalLocks[name];
} catch (e) {
// we will throw for each time allowOnlyOneAtATime has been called in parallel
log.error('loki_snodes:::allowOnlyOneAtATime - error', e.code, e.message);
log.error(
'loki_primitives:::allowOnlyOneAtATime - error',
e.code,
e.message
);
throw e;
}
return outerRetval;
@ -104,7 +116,9 @@ function abortableIterator(array, iterator) {
accum.push(await iterator(item));
} catch (e) {
log.error(
`loki_snodes:::abortableIterator - error ${e.code} ${e.message}`
`loki_primitives:::abortableIterator - error ${e.code} ${
e.message
}`
);
throw e;
}
@ -117,7 +131,7 @@ function abortableIterator(array, iterator) {
},
stop: () => {
/*
log.debug('loki_snodes:::abortableIterator - Stopping',
log.debug('loki_primitives:::abortableIterator - Stopping',
destructableList.length, '+', accum.length, '=', array.length,
'aborted?', abortIteration);
*/