self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-02 12:47:41 +02:00
Code Issues Releases Activity

Desktop: Disable plugin throttling for now

Browse Source
This commit is contained in:
Laurent Cozic 2022-01-19 09:02:53 +00:00
parent c668bb0370
commit 6bb0318c2f
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/app-desktop/services/plugins/BackOffHandler.ts
View File

@ -1,5 +1,4 @@
import Logger from '@joplin/lib/Logger'; import Logger from '@joplin/lib/Logger';
import time from '@joplin/lib/time';
const logger = Logger.create('BackOffHandler'); const logger = Logger.create('BackOffHandler');
@ -52,13 +51,21 @@ export default class BackOffHandler {
this.waitCount_++; this.waitCount_++;
// For now don't actually apply a backoff and don't abort.
logger.warn(`Plugin ${this.pluginId_}: Applying a backoff of ${interval} seconds due to frequent plugin API calls. Consider reducing the number of calls, caching the data, or requesting more data per call. API call was: `, path, args, `[Wait count: ${this.waitCount_}]`); logger.warn(`Plugin ${this.pluginId_}: Applying a backoff of ${interval} seconds due to frequent plugin API calls. Consider reducing the number of calls, caching the data, or requesting more data per call. API call was: `, path, args, `[Wait count: ${this.waitCount_}]`);
if (this.waitCount_ > this.maxWaitCount_) throw new Error(`Plugin ${this.pluginId_}: More than ${this.maxWaitCount_} API alls are waiting - aborting. Please consider queuing the API calls in your plugins to reduce the load on the application.`); if (this.waitCount_ > this.maxWaitCount_) logger.error(`Plugin ${this.pluginId_}: More than ${this.maxWaitCount_} API alls are waiting - aborting. Please consider queuing the API calls in your plugins to reduce the load on the application.`);
await time.sleep(interval);
this.waitCount_--; this.waitCount_--;
// if (this.waitCount_ > this.maxWaitCount_) throw new Error(`Plugin ${this.pluginId_}: More than ${this.maxWaitCount_} API alls are waiting - aborting. Please consider queuing the API calls in your plugins to reduce the load on the application.`);
// await time.sleep(interval);
// this.waitCount_--;
} }
} }

4
packages/app-desktop/services/plugins/PluginRunner.ts
View File

@ -160,10 +160,8 @@ export default class PluginRunner extends BasePluginRunner {
try { try {
await this.backOffHandler(plugin.id).wait(fullPath, debugMappedArgs); await this.backOffHandler(plugin.id).wait(fullPath, debugMappedArgs);
} catch (error) { } catch (error) {
// For now, we don't disable the plugin, but still print the
// errors so that any issue can be investigated easily.
logger.error(error); logger.error(error);
// return; return;
} }
let result: any = null; let result: any = null;