Skip to content

Commit

Permalink
Fixed missing new line at the end of proxy.conf (apache#14359)
Browse files Browse the repository at this point in the history
  • Loading branch information
merlimat committed Feb 18, 2022
1 parent f7f8619 commit 5123d8a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion conf/proxy.conf
Original file line number Diff line number Diff line change
Expand Up @@ -269,4 +269,4 @@ zookeeperSessionTimeoutMs=-1

# ZooKeeper cache expiry time in seconds
# Deprecated: use metadataStoreCacheExpirySeconds
zooKeeperCacheExpirySeconds=-1
zooKeeperCacheExpirySeconds=-1
6 changes: 5 additions & 1 deletion docker/pulsar/scripts/apply-config-from-env.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,11 @@
lines[idx] = '%s=%s\n' % (k, v)


# Add new keys from Env
# Ensure we have a new-line at the end of the file, to avoid issue
# when appending more lines to the config
lines.append('\n')

# Add new keys from Env
for k in sorted(os.environ.keys()):
v = os.environ[k]
if not k.startswith(PF_ENV_PREFIX):
Expand Down

0 comments on commit 5123d8a

Please sign in to comment.