ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject git commit: AMBARI-4178 *-log4j configs for zookeeper, pig and mapreduce services aren't put to the Ambari Server. (ababiichuk)
Date Thu, 26 Dec 2013 12:22:15 GMT
Updated Branches:
  refs/heads/trunk 6f38b1bdb -> c74293552


AMBARI-4178 *-log4j configs for zookeeper, pig and mapreduce services aren't put to the Ambari
Server. (ababiichuk)


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

Branch: refs/heads/trunk
Commit: c742935524bc9dafc22fe06fddad7ceb1934ad69
Parents: 6f38b1b
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Thu Dec 26 14:18:41 2013 +0200
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Thu Dec 26 14:22:00 2013 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard/step8_controller.js | 12 ------------
 ambari-web/app/data/service_configs.js                | 11 +++++++++++
 2 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c7429355/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index a5b6738..ac23c79 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1593,18 +1593,6 @@ App.WizardStep8Controller = Em.Controller.extend({
 
   createLog4jObj: function (serviceName) {
     serviceName = serviceName.toLowerCase();
-    var file = '';
-    switch(serviceName) {
-      case 'zookeeper':
-        file = 'zoo';
-        break;
-      case 'mapreduce':
-      case 'mapreduce2':
-        file = 'mapred';
-        break;
-      default:
-        file = serviceName;
-    }
     var Log4jObj = this.get('configs').filterProperty('filename', serviceName + '-log4j.xml');
     var Log4jProperties = {};
     Log4jObj.forEach(function (_configProperty) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/c7429355/ambari-web/app/data/service_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/service_configs.js b/ambari-web/app/data/service_configs.js
index 90ff712..9f8b9e4 100644
--- a/ambari-web/app/data/service_configs.js
+++ b/ambari-web/app/data/service_configs.js
@@ -204,6 +204,17 @@ module.exports = [
   },
 
   {
+    serviceName: 'PIG',
+    displayName: 'Pig',
+    configCategories: [
+      App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
+      App.ServiceConfigCategory.create({ name: 'AdvancedPigLog4j', displayName : 'Custom
pig-log4j.xml', siteFileName: 'pig-log4j.xml', canAddProperty: true})
+    ],
+    sites: ['pig-log4j'],
+    configs: []
+  },
+
+  {
     serviceName: 'MISC',
     displayName: 'Misc',
     configCategories: [


Mime
View raw message