File tree Expand file tree Collapse file tree 3 files changed +9
-3
lines changed
Expand file tree Collapse file tree 3 files changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -75,7 +75,7 @@ There are 3 methods available:
7575static {
7676 NatsServerRunner . setDefaultOutputSupplier(ConsoleOutput :: new );
7777 NatsServerRunner . setDefaultOutputLevel(Level . WARNING );
78- NatsServerRunner . setPreferredServerPath(" /path/to/nats-server" )
78+ NatsServerRunner . setPreferredServerPath(" /path/to/nats-server" );
7979}
8080```
8181
Original file line number Diff line number Diff line change @@ -284,9 +284,9 @@ public static List<ClusterInsert> createClusterInserts(List<ClusterNode> nodes)
284284 List <ClusterInsert > inserts = new ArrayList <>();
285285 for (ClusterNode node : nodes ) {
286286 List <String > lines = new ArrayList <>();
287- lines .add ("port:" + node .port );
287+ lines .add ("port: " + node .port );
288288 if (node .monitor != null ) {
289- lines .add ("http:" + node .monitor );
289+ lines .add ("http: " + node .monitor );
290290 }
291291 if (node .jsStoreDir != null ) {
292292 String dir = node .jsStoreDir .toString ();
Original file line number Diff line number Diff line change @@ -346,16 +346,22 @@ protected NatsServerRunner(Builder b) throws IOException {
346346 try {
347347 _configFile = File .createTempFile (CONF_FILE_PREFIX , CONF_FILE_EXT );
348348 BufferedWriter writer = new BufferedWriter (new FileWriter (_configFile ));
349+ boolean portAlreadyDone ;
349350 if (b .configFilePath == null ) {
350351 _ports .put (NATS_PORT_KEY , userPort );
351352 writePortLine (writer , userPort );
353+ portAlreadyDone = true ;
352354 }
353355 else {
354356 processSuppliedConfigFile (writer , b .configFilePath );
357+ portAlreadyDone = _ports .get (NATS_PORT_KEY ) != -1 ;
355358 }
356359
357360 if (b .configInserts != null ) {
358361 for (String s : b .configInserts ) {
362+ if (portAlreadyDone && s .startsWith ("port:" )) {
363+ continue ;
364+ }
359365 writeLine (writer , s );
360366 }
361367 }
You can’t perform that action at this time.
0 commit comments