self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-04-01 21:24:45 +02:00
Code Issues Releases Activity

CLI: Fixed performance issue which was causing CLI to wait up to 10 seconds when closing the app

Browse Source
This commit is contained in:
Laurent Cozic 2019-02-09 19:04:00 +00:00
parent 0567188fa8
commit 214eae27da
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CliClient/app/app.js
View File

@ -22,6 +22,7 @@ const os = require('os');
const fs = require('fs-extra'); const fs = require('fs-extra');
const { cliUtils } = require('./cli-utils.js'); const { cliUtils } = require('./cli-utils.js');
const Cache = require('lib/Cache'); const Cache = require('lib/Cache');
const WelcomeUtils = require('lib/WelcomeUtils');
class Application extends BaseApplication { class Application extends BaseApplication {
@ -376,6 +377,8 @@ class Application extends BaseApplication {
return this.stdout(object); return this.stdout(object);
}); });
await WelcomeUtils.install(this.dispatch.bind(this));
// If we have some arguments left at this point, it's a command // If we have some arguments left at this point, it's a command
// so execute it. // so execute it.
if (argv.length) { if (argv.length) {
@ -393,6 +396,12 @@ class Application extends BaseApplication {
} }
process.exit(1); process.exit(1);
} }
await Setting.saveAll();
// Need to call exit() explicitely, otherwise Node wait for any timeout to complete
// https://stackoverflow.com/questions/18050095
process.exit(0);
} else { // Otherwise open the GUI } else { // Otherwise open the GUI
this.initRedux(); this.initRedux();

3
CliClient/app/main.js
View File

@ -1,5 +1,8 @@
#!/usr/bin/env node #!/usr/bin/env node
// Use njstrace to find out what Node.js might be spending time on
// var njstrace = require('njstrace').inject();
// Make it possible to require("/lib/...") without specifying full path // Make it possible to require("/lib/...") without specifying full path
require('app-module-path').addPath(__dirname); require('app-module-path').addPath(__dirname);