move new relic configuration parameters to dev-local.sh / dev-local.bat

Author: huangqun

Gruntfile.js

@@ -242,15 +242,15 @@ module.exports = function (grunt) {
         newrelic : {
             browser : {
                 development : {
-                    licenseKey: "28fb2fc79c",
-                    applicationID: "4447207"
+                    licenseKey: process.env.NEWRELIC_BROWSER_LICENSCEKEY,
+                    applicationID: process.env.NEWRELIC_BROWSER_APPLICATIONID
                 }
             },
             server : {
                 development : {
-                    APP_NAME: "testserver",
-                    LICENSE_KEY: "8f1eb71c599e28fb2b02e7e521488cbabb97174f",
-                    LOGGING_LEVEL : "trace"
+                    APP_NAME: process.env.NEWRELIC_SERVER_APPNAME,
+                    LICENSE_KEY: process.env.NEWRELIC_SERVER_LICENSE_KEY,
+                    LOGGING_LEVEL : process.env.NEWRELIC_SERVER_LOGGING_LEVEL
                 }                
             }
         }

app/index.html

@@ -20,6 +20,7 @@
         // global arena object
         var arena = {};
     </script>
+    <script src="@@STATIC_FILE_HOST/js/newrelic.js"></script>
     <script src="@@STATIC_FILE_HOST/js/bundle.js"></script>
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->

config/dev-local.bat

@@ -85,4 +85,13 @@ set CHALLENGE_ADVERTISING_INTERVAL=5000
 set CHALLENGE_ADVERTISING_UPDATE=300000
 
 :: The TopCoder host name
-set TC_HOSTNAME=http://www.topcoder.com
+set TC_HOSTNAME=http://www.topcoder.com
+
+::The New Relic Browser KEY
+set NEWRELIC_BROWSER_APPLICATIONID='4447207'
+set NEWRELIC_BROWSER_LICENSCEKEY='28fb2fc79c'
+
+::The New Relic Server KEY
+set NEWRELIC_SERVER_APPNAME='testserver'
+set NEWRELIC_SERVER_LICENSE_KEY='8f1eb71c599e28fb2b02e7e521488cbabb97174f'
+set NEWRELIC_SERVER_LOGGING_LEVEL='trace'

config/dev-local.sh

@@ -90,4 +90,12 @@ export CHALLENGE_ADVERTISING_INTERVAL=5000
 export CHALLENGE_ADVERTISING_UPDATE=300000
 
 # The TopCoder host name
-export TC_HOSTNAME=http://www.topcoder.com
+export TC_HOSTNAME=http://www.topcoder.com
+
+#The New Relic Browser KEY
+export NEWRELIC_BROWSER_APPLICATIONID='4447207'
+export NEWRELIC_BROWSER_LICENSCEKEY='28fb2fc79c'
+#The New Relic Server KEY
+export NEWRELIC_SERVER_APPNAME='testserver'
+export NEWRELIC_SERVER_LICENSE_KEY='8f1eb71c599e28fb2b02e7e521488cbabb97174f'
+export NEWRELIC_SERVER_LOGGING_LEVEL='trace'

new_relic/server_tasks/grunt-newrelic.js

@@ -3,18 +3,10 @@
 module.exports = function(grunt) {
   grunt.registerTask("servernewrelic", "generate a newrelic.js file", function(environment) {
 
-    var environment;
-
-    if (process.env.NODE_ENV == null) {
-        environment = "development"
-    }else{
-        environment = process.env.NODE_ENV
-    }
-
     try {
         var target = grunt.config.get('newrelic'),
-            config_path = target.server[environment],
-            app_name = "app_name : ['" + environment  + "-" + config_path.APP_NAME + "']",
+            config_path = target.server["development"],
+            app_name = "app_name : ['development" + "-" + config_path.APP_NAME + "']",
             license_key = "license_key : '" + config_path.LICENSE_KEY + "'",
             logging_level = "level : " + config_path.LOGGING_LEVEL + "'";
 
@@ -41,4 +33,4 @@ module.exports = function(grunt) {
         grunt.log.ok("Unable to write newrelic.js");
     }
   });
-};
+};

new_relic/tasks/grunt-newrelic.js

@@ -5,15 +5,9 @@ module.exports = function(grunt) {
     grunt.registerTask("newrelic", "generate a newrelic.js file", function() {
         var environment;
 
-        if (process.env.NODE_ENV == null) {
-            environment = "development"
-        }else{
-            environment = process.env.NODE_ENV
-        }
-
         try {
             var target = grunt.config.get('newrelic'),
-                config_path = target.browser[environment], 
+                config_path = target.browser["development"], 
                 applicationID = 'applicationID : "' + config_path.applicationID + '"',
                 license_key = 'license_key : "' + config_path.licenseKey + '"';
         }