mirror of
https://github.com/atom/atom.git
synced 2026-02-13 08:04:56 -05:00
Make socketPath shorter
To work around the limited socket file length on macOS/BSD.
This commit is contained in:
@@ -38,12 +38,15 @@ class AtomApplication
|
||||
# Lowercasing the ATOM_HOME to make sure that we don't get multiple sockets
|
||||
# on case-insensitive filesystems due to arbitrary case differences in paths.
|
||||
atomHomeUnique = path.resolve(process.env.ATOM_HOME).toLowerCase()
|
||||
hash = crypto.createHash('sha1').update(username).update('|').update(atomHomeUnique)
|
||||
atomInstanceDigest = hash.digest('hex').substring(0, 32)
|
||||
hash = crypto.createHash('sha1').update(options.version).update('|').update(process.arch).update('|').update(username).update('|').update(atomHomeUnique)
|
||||
# We only keep the first 12 characters of the hash as not to have excessively long
|
||||
# socket file. Note that macOS/BSD limit the length of socket file paths (see #15081).
|
||||
# The replace calls convert the digest into "URL and Filename Safe" encoding (see RFC 4648).
|
||||
atomInstanceDigest = hash.digest('base64').substring(0, 12).replace(/\+/g, '-').replace(/\//g, '_')
|
||||
if process.platform is 'win32'
|
||||
options.socketPath = "\\\\.\\pipe\\atom-#{options.version}-#{process.arch}-#{atomInstanceDigest}-sock"
|
||||
options.socketPath = "\\\\.\\pipe\\atom-#{atomInstanceDigest}-sock"
|
||||
else
|
||||
options.socketPath = path.join(os.tmpdir(), "atom-#{options.version}-#{process.arch}-#{atomInstanceDigest}.sock")
|
||||
options.socketPath = path.join(os.tmpdir(), "atom-#{atomInstanceDigest}.sock")
|
||||
|
||||
# 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
|
||||
|
||||
Reference in New Issue
Block a user