summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Hagemeister2014-10-20 14:36:26 +0200
committerBjörn Hagemeister2014-10-20 14:36:26 +0200
commitaaefe2579efdeb3d19b957b26029366218943d61 (patch)
treedb2f747e9a5d44af882be8f1b8d6f96a367a7f0d
parentUpdated TODO.txt. (diff)
downloadsatellite-daemon-aaefe2579efdeb3d19b957b26029366218943d61.tar.gz
satellite-daemon-aaefe2579efdeb3d19b957b26029366218943d61.tar.xz
satellite-daemon-aaefe2579efdeb3d19b957b26029366218943d61.zip
Edited return information of command line argument options.
-rw-r--r--src/main/java/org/openslx/satellitedaemon/App.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/App.java b/src/main/java/org/openslx/satellitedaemon/App.java
index e2f7bb8..3cdb62a 100644
--- a/src/main/java/org/openslx/satellitedaemon/App.java
+++ b/src/main/java/org/openslx/satellitedaemon/App.java
@@ -49,7 +49,7 @@ public class App
else
System.exit( 2 );
} else {
- log.error( "--genid requires <organizationName>" );
+ log.error( "Illegal option: --genid requires <organizationName>" );
System.exit( 2 );
}
} else if ( arg.equals( "--import" ) ) {
@@ -74,7 +74,7 @@ public class App
else
System.exit( 2 );
} else {
- log.error( "--submitkey requires <IPADDRESS>" );
+ log.error( "Illegal option: --submitkey requires <IPADDRESS>" );
System.exit( 2 );
}
} else if ( arg.equals( "--updateaddress" ) ) {
@@ -85,7 +85,7 @@ public class App
} else
System.exit( 2 );
} else {
- log.error( "--updateaddress requires <IPADDRESS>" );
+ log.error( "Illegal option: --updateaddress requires <IPADDRESS>" );
System.exit( 2 );
}
}
@@ -109,8 +109,10 @@ public class App
private static boolean checkConfig()
{
- if ( Identity.getOrganizationName() == null )
+ if ( Identity.getOrganizationName() == null ) {
+ log.error( "Checking config failed: no existing organization name." );
return false;
+ }
RSAPublicKey pub = (RSAPublicKey)Identity.getPublicKey();
RSAPrivateKey priv = (RSAPrivateKey)Identity.getPrivateKey();
assert ( pub.getModulus() == priv.getModulus() );