[2/2] incubator-trafficcontrol git commit: remove moneyTrace log expression from LogFormat.format parameter select statement in edge profile sql

[de...@apache.org]

remove moneyTrace log expression from LogFormat.format parameter select statement in edge profile sql


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/114997ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/114997ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/114997ad

Branch: refs/heads/master
Commit: 114997ad5a168e7eba487435f976cc78dd681c58
Parents: f4d17ba
Author: Dylan Volz <Dy...@comcast.com>
Authored: Thu May 25 09:59:41 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue May 30 10:02:51 2017 -0600

----------------------------------------------------------------------
 traffic_ops/install/data/profiles/trafficserver_edge.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/114997ad/traffic_ops/install/data/profiles/trafficserver_edge.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/install/data/profiles/trafficserver_edge.sql b/traffic_ops/install/data/profiles/trafficserver_edge.sql
index 3967a98..ad4add3 100644
--- a/traffic_ops/install/data/profiles/trafficserver_edge.sql
+++ b/traffic_ops/install/data/profiles/trafficserver_edge.sql
@@ -948,7 +948,7 @@ INSERT INTO parameter (name, config_file, value) VALUES ('location','cache.confi
 INSERT INTO profile_parameter (profile, parameter) VALUES ( (select id from profile where name = 'EDGE_PROFILE'), (select id from parameter where name = 'location' and config_file = 'cache.config' and value = '/opt/trafficserver/etc/trafficserver/') )  ON CONFLICT (profile, parameter) DO NOTHING;
 
 INSERT INTO parameter (name, config_file, value) VALUES ('LogFormat.Format','logs_xml.config','%<cqtq> chi=%<chi> phn=%<phn> php=%<php> shn=%<shn> url=%<cquuc> cqhm=%<cqhm> cqhv=%<cqhv> pssc=%<pssc> ttms=%<ttms> b=%<pscl> sssc=%<sssc> sscl=%<sscl> cfsc=%<cfsc> pfsc=%<pfsc> crc=%<crc> phr=%<phr> pqsn=%<pqsn> uas="%<{User-Agent}cqh>" ') ON CONFLICT (name,config_file, value) DO NOTHING;
-INSERT INTO profile_parameter (profile, parameter) VALUES ( (select id from profile where name = 'EDGE_PROFILE'), (select id from parameter where name = 'LogFormat.Format' and config_file = 'logs_xml.config' and value = '%<cqtq> chi=%<chi> phn=%<phn> php=%<php> shn=%<shn> url=%<cquuc> cqhm=%<cqhm> cqhv=%<cqhv> pssc=%<pssc> ttms=%<ttms> b=%<pscl> sssc=%<sssc> sscl=%<sscl> cfsc=%<cfsc> pfsc=%<pfsc> crc=%<crc> phr=%<phr> pqsn=%<pqsn> uas="%<{User-Agent}cqh>" xmt="%<{X-MoneyTrace}cqh>" ') )  ON CONFLICT (profile, parameter) DO NOTHING;
+INSERT INTO profile_parameter (profile, parameter) VALUES ( (select id from profile where name = 'EDGE_PROFILE'), (select id from parameter where name = 'LogFormat.Format' and config_file = 'logs_xml.config' and value = '%<cqtq> chi=%<chi> phn=%<phn> php=%<php> shn=%<shn> url=%<cquuc> cqhm=%<cqhm> cqhv=%<cqhv> pssc=%<pssc> ttms=%<ttms> b=%<pscl> sssc=%<sssc> sscl=%<sscl> cfsc=%<cfsc> pfsc=%<pfsc> crc=%<crc> phr=%<phr> pqsn=%<pqsn> uas="%<{User-Agent}cqh>" ') )  ON CONFLICT (profile, parameter) DO NOTHING;
 
 INSERT INTO parameter (name, config_file, value) VALUES ('LogFormat.Name','logs_xml.config','custom_ats_2') ON CONFLICT (name,config_file, value) DO NOTHING;
 INSERT INTO profile_parameter (profile, parameter) VALUES ( (select id from profile where name = 'EDGE_PROFILE'), (select id from parameter where name = 'LogFormat.Name' and config_file = 'logs_xml.config' and value = 'custom_ats_2') )  ON CONFLICT (profile, parameter) DO NOTHING;