[2/2] incubator-trafficcontrol git commit: adds absolute path to server config with local fallback

[de...@apache.org]

adds absolute path to server config with local fallback


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

Branch: refs/heads/master
Commit: ab1d3e43d7976a79cf0e3bfd6ebad89fcd2a85f7
Parents: c830862
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Mon Apr 10 13:53:49 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Mon Apr 10 13:56:00 2017 -0600

----------------------------------------------------------------------
 traffic_ops/experimental/ui/server.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ab1d3e43/traffic_ops/experimental/ui/server.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/server.js b/traffic_ops/experimental/ui/server.js
index 3501307..8d9e0e1 100644
--- a/traffic_ops/experimental/ui/server.js
+++ b/traffic_ops/experimental/ui/server.js
@@ -28,8 +28,16 @@ var constants = require('constants'),
     modRewrite = require('connect-modrewrite'),
     timeout = require('connect-timeout');
 
-var config = require('./conf/config'),
-    logStream = fs.createWriteStream(config.log.stream, { flags: 'a' }),
+var config;
+
+try {
+    config = require('/opt/traffic_ops_ui/conf/config');
+}
+catch(e) {
+    config = require('./conf/config');
+}
+
+var logStream = fs.createWriteStream(config.log.stream, { flags: 'a' }),
     useSSL = config.useSSL;
 
 // Disable for self-signed certs in dev/test