2 Commits

2 changed files with 11 additions and 13 deletions
@@ -16,10 +16,9 @@ public final class JupiterPerpsAlarmImpl {
try { try {
config = Config.parse(args, System.getenv()); config = Config.parse(args, System.getenv());
} catch (IllegalArgumentException exception) { } catch (IllegalArgumentException exception) {
System.err.println(exception.getMessage());
printUsage(); printUsage();
System.exit(2); String errMsg = "Could not parse configuration for JupiterPerpsAlarm: " + exception.getMessage() + "!";
return; throw new IllegalStateException(errMsg, exception);
} }
if (config.selfTest()) { if (config.selfTest()) {
@@ -32,9 +31,8 @@ public final class JupiterPerpsAlarmImpl {
try { try {
definitions = AlarmConfigurationParser.parse(config.alarmConfiguration()); definitions = AlarmConfigurationParser.parse(config.alarmConfiguration());
} catch (Exception exception) { } catch (Exception exception) {
System.err.println("Could not load alarm configuration: " + exception.getMessage()); String errMsg = "Could not load alarm configuration: " + exception.getMessage() + "!";
System.exit(2); throw new IllegalStateException(errMsg, exception);
return;
} }
List<AlarmAction> actions = new ArrayList<>(); List<AlarmAction> actions = new ArrayList<>();
@@ -39,13 +39,13 @@ public class NenjimHubImpl implements NenjimHub {
private void startAutoRunProcesses() throws Exception { private void startAutoRunProcesses() throws Exception {
String[] processesToAutoStart = { String[] processesToAutoStart = {
//"com.r35157.jupiterperpsalarm.impl.ref.JupiterPerpsAlarmImpl"
"crypto.r35157.nenjim.NenjimHubSocketAdminAdapter", //"crypto.r35157.nenjim.NenjimHubSocketAdminAdapter",
"crypto.r35157.nenjim.NenjimHubRestAdminAdapter", //"crypto.r35157.nenjim.NenjimHubRestAdminAdapter",
"crypto.r35157.nenjim.NenjimHubRPCAdminAdapter", //"crypto.r35157.nenjim.NenjimHubRPCAdminAdapter",
"crypto.r35157.nenjim.SuwimoHub", //"crypto.r35157.nenjim.SuwimoHub",
"crypto.r35157.nenjim.SodaTaskManager", //"crypto.r35157.nenjim.SodaTaskManager",
"crypto.r35157.assetaz.hub.AssetAZHub" //"crypto.r35157.assetaz.hub.AssetAZHub"
}; };
for (String processInterfaceName : processesToAutoStart) { for (String processInterfaceName : processesToAutoStart) {