Skip to content

Commit 0b78b72

Browse files
committed
bugfix/sourceUrl configuration
Former-commit-id: 42c1159
1 parent 41162a0 commit 0b78b72

3 files changed

Lines changed: 12 additions & 8 deletions

File tree

README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,11 @@ nats.server.hb_fail_count=3
3838
```yaml
3939
nats:
4040
source:
41-
default: "https://nats-linux.zip"
42-
```
43-
```yaml
44-
nats:
45-
source:
46-
default: "file://${user.dir}/src/test/resources/natsserver/mac.zip"
41+
mac: "https://nats-mac.zip"
42+
linux: "https://nats-linux.zip"
43+
solaris: "https://nats-solaris.zip"
44+
windows: "https://nats-windows.zip"
45+
default: "file://${user.dir}/nats-foo-bar.zip"
4746
```
4847
4948
### TODO

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>berlin.yuna</groupId>
1414
<artifactId>nats-streaming-server-embedded</artifactId>
15-
<version>0.4.3</version>
15+
<version>0.4.4</version>
1616
<packaging>jar</packaging>
1717

1818
<name>${project.artifactId}</name>

src/main/java/berlin/yuna/natsserver/annotation/EnableNatsServerContextCustomizer.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import berlin.yuna.natsserver.config.NatsServerConfig;
44
import berlin.yuna.natsserver.logic.NatsServer;
5+
import berlin.yuna.system.logic.SystemUtil;
56
import org.slf4j.Logger;
67
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
78
import org.springframework.beans.factory.support.DefaultSingletonBeanRegistry;
@@ -51,7 +52,7 @@ public void customizeContext(ConfigurableApplicationContext context, MergedConte
5152

5253
NatsServer natsServerBean = new NatsServer(enableNatsServer.natsServerConfig());
5354
natsServerBean.port(overwritePort(natsServerBean));
54-
String sourceUrl = environment.getProperty("nats.source.default");
55+
String sourceUrl = overwriteSourceUrl(environment, natsServerBean.source());
5556
natsServerBean.source(isEmpty(sourceUrl) ? natsServerBean.source() : sourceUrl);
5657
natsServerBean.setNatsServerConfig(mergeConfig(environment, natsServerBean.getNatsServerConfig()));
5758

@@ -67,6 +68,10 @@ public void customizeContext(ConfigurableApplicationContext context, MergedConte
6768
((DefaultSingletonBeanRegistry) beanFactory).registerDisposableBean(NatsServer.BEAN_NAME, natsServerBean);
6869
}
6970

71+
private String overwriteSourceUrl(final ConfigurableEnvironment environment, final String fallback) {
72+
return environment.getProperty("nats.source.default", environment.getProperty("nats.source." + SystemUtil.getOsType().toString().toLowerCase(), fallback));
73+
}
74+
7075
private int overwritePort(NatsServer natsServerBean) {
7176
return enableNatsServer.port() != (Integer) NatsServerConfig.PORT.getDefaultValue() ? enableNatsServer.port() : natsServerBean.port();
7277
}

0 commit comments

Comments
 (0)