Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-24 05:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(conf) Add migration warning when ZOOKEEPER_HOSTS is not set.

Browse Source
This commit is contained in:
Viktor Lofgren 2024-02-28 12:09:01 +01:00
parent 20fc0ef13c
commit a8ec59eb75
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
code/common/service-discovery/java/nu/marginalia/service/ServiceDiscoveryModule.java
View File

@ -17,7 +17,7 @@ public class ServiceDiscoveryModule extends AbstractModule {
private static final Logger logger = LoggerFactory.getLogger(ServiceDiscoveryModule.class); private static final Logger logger = LoggerFactory.getLogger(ServiceDiscoveryModule.class);
public void configure() { public void configure() {
var hosts = getZookeeperHosts().orElseThrow(() -> new IllegalStateException("Zookeeper hosts not set")); var hosts = getZookeeperHosts();
logger.info("Using Zookeeper service registry at {}", hosts); logger.info("Using Zookeeper service registry at {}", hosts);
CuratorFramework client = CuratorFrameworkFactory CuratorFramework client = CuratorFrameworkFactory
.newClient(hosts, new ExponentialBackoffRetry(100, 10, 1000)); .newClient(hosts, new ExponentialBackoffRetry(100, 10, 1000));
@ -26,11 +26,21 @@ public class ServiceDiscoveryModule extends AbstractModule {
bind(ServiceRegistryIf.class).to(ZkServiceRegistry.class); bind(ServiceRegistryIf.class).to(ZkServiceRegistry.class);
} }
private Optional<String> getZookeeperHosts() { private String getZookeeperHosts() {
if (System.getProperty("zookeeper-hosts") != null) { if (System.getProperty("zookeeper-hosts") != null) {
return Optional.of(System.getProperty("zookeeper-hosts")); return System.getProperty("zookeeper-hosts");
} }
return Optional.ofNullable(System.getenv("ZOOKEEPER_HOSTS")); String env = System.getenv("ZOOKEEPER_HOSTS");
if (null == env) {
System.err.println("""
ZOOKEEPER_HOSTS not set. This probably means that you are running an old installation,
or that the environment is not set up correctly.
See the 2024-03+ migration notes, https://docs.marginalia.nu/6_notes/6_1__migrate_2024_03_plus
""");
}
return env;
} }
} }