Initial changes for 1911 #146
Conversation
| @@ -99,16 +100,46 @@ private void stopAndUninstallBundle(final Bundle bundle, final String pluginName | |||
| registry.remove(pluginName); | |||
| } | |||
|
|
|||
| public void startBundles() { | |||
| public void startBundles(final List<String> mandatoryPlugins) { | |||
There was a problem hiding this comment.
We could use an Iterable here - and the caller could pass a Set (no duplicate)
| boolean allMandatoryPluginsStarted = true; | ||
| for (String pluginName: mandatoryPlugins) { | ||
| if(!pluginsStarted.contains(pluginName)) { | ||
| log.error("Mandatory plugin {} not started",pluginName); //TODO_1911 - Exit here? |
There was a problem hiding this comment.
You could 'warn' instead and as discussed caller will take action - you can remove the comment.
There was a problem hiding this comment.
Made changes to warn and throw an exception
| } | ||
|
|
||
| private void checkIfMandatoryPluginsAreStarted(List<String> pluginsStarted, List<String> mandatoryPlugins){ |
| allMandatoryPluginsStarted = false; | ||
| } | ||
| } | ||
| if(allMandatoryPluginsStarted) { |
| @@ -98,8 +99,10 @@ public void initialize() { | |||
|
|
|||
| @LifecycleHandlerType(LifecycleHandlerType.LifecycleLevel.START_PLUGIN) | |||
| public void start() { | |||
| final String mandatoryPlugins = osgiConfig.getMandatoryPluginsList(); | |||
| final List<String> mandatoryPluginsList = mandatoryPlugins != null && !mandatoryPlugins.isEmpty() ? List.of(mandatoryPlugins.split(",")) : Collections.emptyList(); | |||
There was a problem hiding this comment.
I forgot what we do for other similar types of properties: Do we need to split taking into account whitespaces, e.g. "\\s*,\\s*" (not tested) ?
There was a problem hiding this comment.
Fixed to split by taking whitespaces into account.
| @Config("org.killbill.billing.plugin.mandatory.plugins") | ||
| @Description("List of mandatory plugins") | ||
| @Default("") | ||
| public String getMandatoryPluginsList(); |
| @@ -53,10 +52,14 @@ public class DefaultLifecycle implements Lifecycle { | |||
| // See https://github.com/killbill/killbill-commons/issues/143 | |||
| private final Map<LifecycleLevel, SortedSet<LifecycleHandler<? extends KillbillService>>> handlersByLevel; | |||
|
|
|||
| private static final String EXIT_ON_LIFECYCLE_ERROR_PROPERTY = "org.killbill.server.exit.on.lifecycle.error"; | |||
There was a problem hiding this comment.
Ideally, we should expose this under a KillbillPlatformConfig class - unfortunately, we cannot use KillbillServerConfig as it is not available from the lifecycle module. One option would be to create a LifecycleConfig and expose the property. I suggest we could look at this on a subsequent PR.
| @Config("org.killbill.billing.plugin.mandatory.plugins") | ||
| @Description("List of mandatory plugins") | ||
| @Default("") | ||
| public String getMandatoryPluginsList(); |
There was a problem hiding this comment.
We have some examples already like here
No description provided.