git://git.nikiroo.be
/
fanfix.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
159c11d
)
allow --remote on --stop-server
author
Niki Roo
<niki@nikiroo.be>
Fri, 3 Apr 2020 18:18:46 +0000
(20:18 +0200)
committer
Niki Roo
<niki@nikiroo.be>
Fri, 3 Apr 2020 18:18:46 +0000
(20:18 +0200)
src/be/nikiroo/fanfix/Main.java
patch
|
blob
|
blame
|
history
diff --git
a/src/be/nikiroo/fanfix/Main.java
b/src/be/nikiroo/fanfix/Main.java
index 2ed276b1ea335dce6be6ed116b8e7973edd9f0ec..6f77e443bebdab359bbf2589f2e89cb35c925f4d 100644
(file)
--- a/
src/be/nikiroo/fanfix/Main.java
+++ b/
src/be/nikiroo/fanfix/Main.java
@@
-597,10
+597,14
@@
public class Main {
}
return;
case STOP_SERVER:
}
return;
case STOP_SERVER:
- key = Instance.getConfig().getString(Config.SERVER_KEY);
- port = Instance.getConfig().getInteger(Config.SERVER_PORT);
+ // Can be given via "--remote XX XX XX"
+ if (key == null)
+ key = Instance.getConfig().getString(Config.SERVER_KEY);
+ if (port == null)
+ port = Instance.getConfig().getInteger(Config.SERVER_PORT);
+
if (port == null) {
if (port == null) {
- System.err.println("No port configured in the config file");
+ System.err.println("No port
given nor
configured in the config file");
exitCode = 15;
break;
}
exitCode = 15;
break;
}