github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 14:59:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove the handling logic for the --socket-path arg

Browse Source
This commit is contained in:
Rafael Oleza
2019-04-04 12:25:01 +02:00
parent d40ca4b675
commit bca056d956
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main-process/atom-application.js
View File

@@ -119,14 +119,16 @@ class AtomApplication extends EventEmitter {
// Public: The entry point into the Atom application.
static open (options) {
const socketSecret = getExistingSocketSecret(options.version)
const socketPath = options.socketPath || getSocketPath(socketSecret)
const socketPath = getSocketPath(socketSecret)
// FIXME: Sometimes when socketPath doesn't exist, net.connect would strangely
// take a few seconds to trigger 'error' event, it could be a bug of node
// or electron, before it's fixed we check the existence of socketPath to
// speedup startup.
if ((process.platform !== 'win32' && !fs.existsSync(socketPath)) ||
options.test || options.benchmark || options.benchmarkTest || !socketPath) {
if (
!socketPath || options.test || options.benchmark || options.benchmarkTest ||
(process.platform !== 'win32' && !fs.existsSync(socketPath))
) {
new AtomApplication(options).initialize(options)
return
}
@@ -425,6 +427,10 @@ class AtomApplication extends EventEmitter {
}
deleteSocketSecretFile () {
if (!this.socketSecret) {
return
}
const socketSecretPath = getSocketSecretPath(this.version)
if (fs.existsSync(socketSecretPath)) {