sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-11-02 20:36:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

followup to handle situations where creating symlinks fails

Browse source
This commit is contained in:
Craig Raw 2024-03-27 13:08:01 +02:00
parent d1a353ae53
commit 5d674b7e91
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/main/java/com/sparrowwallet/sparrow/instance/Instance.java
View file

@ -134,13 +134,17 @@ public abstract class Instance {
private Path getLockFile(boolean findExisting) { private Path getLockFile(boolean findExisting) {
if(findExisting) { if(findExisting) {
Path symlink = getSystemSymlinkPath(); Path pointer = getSystemLockFilePointer();
try { try {
if(Files.exists(symlink)) { if(Files.exists(pointer)) {
return Files.readSymbolicLink(symlink); if(Files.isSymbolicLink(pointer)) {
return Files.readSymbolicLink(pointer);
} else {
return Path.of(Files.readString(pointer, StandardCharsets.UTF_8));
}
} }
} catch(IOException e) { } catch(IOException e) {
log.warn("Could not follow symbolic link at " + symlink.toAbsolutePath()); log.warn("Could not follow symbolic link at " + pointer.toAbsolutePath());
} catch(Exception e) { } catch(Exception e) {
//ignore //ignore
} }
@ -150,21 +154,27 @@ public abstract class Instance {
} }
private void createSymlink(Path lockFile) { private void createSymlink(Path lockFile) {
Path symlink = getSystemSymlinkPath(); Path pointer = getSystemLockFilePointer();
try { try {
if(!Files.exists(symlink, LinkOption.NOFOLLOW_LINKS)) { if(!Files.exists(pointer, LinkOption.NOFOLLOW_LINKS)) {
Files.createSymbolicLink(symlink, lockFile); Files.createSymbolicLink(pointer, lockFile);
log.warn("Created symlink at " + symlink.toAbsolutePath()); pointer.toFile().deleteOnExit();
symlink.toFile().deleteOnExit();
} }
} catch(IOException e) { } catch(IOException e) {
log.warn("Could not create symlink " + symlink.toAbsolutePath() + " to lockFile at " + lockFile.toAbsolutePath()); log.debug("Could not create symlink " + pointer.toAbsolutePath() + " to lockFile at " + lockFile.toAbsolutePath() + ", writing as normal file", e);
try {
Files.writeString(pointer, lockFile.toAbsolutePath().toString(), StandardCharsets.UTF_8);
pointer.toFile().deleteOnExit();
} catch(IOException ex) {
log.warn("Could not create pointer " + pointer.toAbsolutePath() + " to lockFile at " + lockFile.toAbsolutePath(), ex);
}
} catch(Exception e) { } catch(Exception e) {
//ignore //ignore
} }
} }
private Path getSystemSymlinkPath() { private Path getSystemLockFilePointer() {
return Path.of(System.getProperty("java.io.tmpdir")).resolve(applicationId + ".link"); return Path.of(System.getProperty("java.io.tmpdir")).resolve(applicationId + ".link");
} }
@ -179,7 +189,7 @@ public abstract class Instance {
serverChannel.close(); serverChannel.close();
} }
Files.deleteIfExists(getSystemSymlinkPath()); Files.deleteIfExists(getSystemLockFilePointer());
Files.deleteIfExists(getLockFile(false)); Files.deleteIfExists(getLockFile(false));
} catch(Exception e) { } catch(Exception e) {
throw new InstanceException(e); throw new InstanceException(e);