webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-09-01 20:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add parameter to specify busname

Browse source 
This way multiple instances of signal-cli can run in daemon-mode in
parallel. This was not possible previously as they tried to create the
same DBus.

This is rather my own quick fix and I guess there exists a cleaner way.
(Maybe let the parser parse the busname directly to `SIGNAL_BUSNAME`.)
This commit is contained in:
Julius Bünger 2019-01-15 13:33:30 +01:00
parent 58895aaf03
commit 0816eeef1a
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/asamk/signal/Main.java
View file

@ -167,6 +167,8 @@ public class Main {
.action(Arguments.version());
parser.addArgument("--config")
.help("Set the path, where to store the config (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli).");
parser.addArgument("-n", "--busname")
.help("Name of the DBus.");
MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup();
mut.addArgument("-u", "--username")

8
src/main/java/org/asamk/signal/commands/DaemonCommand.java
View file

@ -41,6 +41,7 @@ public class DaemonCommand implements LocalCommand {
try {
try {
int busType;
String busName;
if (ns.getBoolean("system")) {
busType = DBusConnection.SYSTEM;
} else {
@ -48,7 +49,12 @@ public class DaemonCommand implements LocalCommand {
}
conn = DBusConnection.getConnection(busType);
conn.exportObject(SIGNAL_OBJECTPATH, m);
conn.requestBusName(SIGNAL_BUSNAME);
busName = ns.getString("busname");
if (busName == null) {
conn.requestBusName(SIGNAL_BUSNAME);
} else {
conn.requestBusName(busName);
}
} catch (UnsatisfiedLinkError e) {
System.err.println("Missing native library dependency for dbus service: " + e.getMessage());
return 1;