[pulsar] branch branch-2.10 updated: Fixed missing new line at the end of proxy.conf (#14359)

[pe...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

penghui pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.10 by this push:
     new 15f9fba  Fixed missing new line at the end of proxy.conf (#14359)
15f9fba is described below

commit 15f9fba80714a194954a89d7ae0be12faab8cf30
Author: Matteo Merli <mm...@apache.org>
AuthorDate: Thu Feb 17 16:22:35 2022 -0800

    Fixed missing new line at the end of proxy.conf (#14359)
    
    (cherry picked from commit 5123d8a67362d0091609789a65872ae02df5cccd)
---
 conf/proxy.conf                                | 2 +-
 docker/pulsar/scripts/apply-config-from-env.py | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/conf/proxy.conf b/conf/proxy.conf
index 5d93959..e4cf8b5 100644
--- a/conf/proxy.conf
+++ b/conf/proxy.conf
@@ -269,4 +269,4 @@ zookeeperSessionTimeoutMs=-1
 
 # ZooKeeper cache expiry time in seconds
 # Deprecated: use metadataStoreCacheExpirySeconds
-zooKeeperCacheExpirySeconds=-1
\ No newline at end of file
+zooKeeperCacheExpirySeconds=-1
diff --git a/docker/pulsar/scripts/apply-config-from-env.py b/docker/pulsar/scripts/apply-config-from-env.py
index 6e2eb74..8438f137 100755
--- a/docker/pulsar/scripts/apply-config-from-env.py
+++ b/docker/pulsar/scripts/apply-config-from-env.py
@@ -75,7 +75,11 @@ for conf_filename in conf_files:
             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):