ref #FLUME-3361 Added support for environment variable in ZooKeeper b… #326
Conversation
…ased conf by setting -DpropertiesImplementation=org.apache.flume.node.EnvVarResolverProperties . This is consistent with the way environment variables are supported in local file based Flume agent conf.
… conf by setting -DpropertiesImplementation=org.apache.flume.node.EnvVarResolverProperties . This is consistent with the way environment variables are supported in local file based Flume agent conf. Also fixed code style issues.
|
Fixed code style issues. |
| properties.load(new StringReader(fileContent)); | ||
| configMap = toMap(properties); | ||
| Map<String, String> configMap = Collections.emptyMap(); | ||
| if (configData != null && configData.length > 0) { |
There was a problem hiding this comment.
The else case previously set configMap = Collections.emptyMap(). We should retain this behaviour.
There was a problem hiding this comment.
Thanks for taking it up Tristan!
I have initialized configMap to emptyMap (Map<String, String> configMap = Collections.emptyMap();) so that an emptyMap (and not null) is returned even in case of a handled exception.
Tried to explain in detail below. Please let me know if I'm missing anything.
BEFORE:
Map m = null
if config does not exists
m = empty Map
return m
else
m = Map with config value //IO Exception is thrown
return m
NOW:
Map m = empty Map (so that I don't end up returning null in case of exceptions below)
if config exists
m = Map with config value
catch new possible exceptions other than IO
return m //so returning empty map like before (retaining the behavior)
//if Config does not exist or if an exception occurs that is handled
There was a problem hiding this comment.
Hi Tristan, please let me know if you are waiting for anything else from me.
|
Hey Tristan, Thanks |
Added support for environment variable in ZooKeeper based conf by setting
-DpropertiesImplementation=org.apache.flume.node.EnvVarResolverProperties . This is consistent with the way environment variables are supported in local file based Flume agent conf.