[trafficserver] 01/02: traffic_manager: fix --tsArgs to work.

[am...@apache.org]

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

amc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit c14fac1ceda81c45bbc5fc70dd2440a2e68e6764
Author: Alan M. Carroll <am...@apache.org>
AuthorDate: Sat Jul 7 10:49:56 2018 -0500

    traffic_manager: fix --tsArgs to work.
---
 src/traffic_manager/traffic_manager.cc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/traffic_manager/traffic_manager.cc b/src/traffic_manager/traffic_manager.cc
index e25a0b9..2b6a75b 100644
--- a/src/traffic_manager/traffic_manager.cc
+++ b/src/traffic_manager/traffic_manager.cc
@@ -639,11 +639,6 @@ main(int argc, const char **argv)
   // stat the 'sync_thr' until 'configFiles' has been initialized.
   RecLocalStart(configFiles);
 
-  /* Update cmd line overrides/environmental overrides/etc */
-  if (tsArgs) { /* Passed command line args for proxy */
-    lmgmt->proxy_options = ats_strdup(tsArgs);
-  }
-
   // TS needs to be started up with the same outputlog bindings each time,
   // so we append the outputlog location to the persistent proxy options
   //
@@ -659,6 +654,9 @@ main(int argc, const char **argv)
     const char *space = args.empty() ? "" : " ";
     args.format("%s%s %s", space, "--" TM_OPT_BIND_STDERR, bind_stderr);
   }
+  if (tsArgs) {
+    args.format("%s", tsArgs);
+  }
 
   lmgmt->proxy_options = args.release();