webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add CommandException to abstract cli return codes for errors

Browse source
This commit is contained in:
AsamK 2021-02-22 20:43:08 +01:00
parent c6395b9f35
commit 221d937eec
47 changed files with 538 additions and 572 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,8 @@ import org.asamk.signal.DbusConfig;
import org.asamk.signal.DbusReceiveMessageHandler;
import org.asamk.signal.JsonDbusReceiveMessageHandler;
import org.asamk.signal.OutputType;
import org.asamk.signal.commands.exceptions.CommandException;
import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
import org.asamk.signal.dbus.DbusSignalImpl;
import org.asamk.signal.manager.Manager;
import org.freedesktop.dbus.connections.impl.DBusConnection;
@ -44,7 +46,7 @@ public class DaemonCommand implements MultiLocalCommand {
}
@Override
public int handleCommand(final Namespace ns, final Manager m) {
public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
// TODO delete later when "json" variable is removed
@ -71,15 +73,14 @@ public class DaemonCommand implements MultiLocalCommand {
t.join();
} catch (InterruptedException ignored) {
}
return 0;
} catch (DBusException | IOException e) {
logger.error("Dbus command failed", e);
return 2;
throw new UnexpectedErrorException("Dbus command failed");
}
}
@Override
public int handleCommand(final Namespace ns, final List<Manager> managers) {
public void handleCommand(final Namespace ns, final List<Manager> managers) throws CommandException {
var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
// TODO delete later when "json" variable is removed
@ -112,10 +113,9 @@ public class DaemonCommand implements MultiLocalCommand {
} catch (InterruptedException ignored) {
}
}
return 0;
} catch (DBusException | IOException e) {
logger.error("Dbus command failed", e);
return 2;
throw new UnexpectedErrorException("Dbus command failed");
}
}