소스 검색

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

aBabiichuk 11 년 전
부모
커밋
c742935524
2개의 변경된 파일11개의 추가작업 그리고 12개의 파일을 삭제
  1. 0 12
      ambari-web/app/controllers/wizard/step8_controller.js
  2. 11 0
      ambari-web/app/data/service_configs.js

+ 0 - 12
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) {

+ 11 - 0
ambari-web/app/data/service_configs.js

@@ -203,6 +203,17 @@ module.exports = [
     configs: []
   },
 
+  {
+    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',