From a38af6e6bec9d75b2dfe2e1405897aaa95c25ba4 Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Tue, 16 Dec 2014 19:29:23 +0800
Subject: [PATCH] add log for send email

---
 .../java/com/kylinolap/job/flow/JobFlowListener.java   |  9 +++++++++
 webapp/app/js/controllers/cubeEdit.js                  | 18 +++++++++++-------
 webapp/app/js/controllers/page.js                      |  4 ++--
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/job/src/main/java/com/kylinolap/job/flow/JobFlowListener.java b/job/src/main/java/com/kylinolap/job/flow/JobFlowListener.java
index bac29a8..faadd65 100644
--- a/job/src/main/java/com/kylinolap/job/flow/JobFlowListener.java
+++ b/job/src/main/java/com/kylinolap/job/flow/JobFlowListener.java
@@ -383,6 +383,7 @@ protected void notifyUsers(JobInstance jobInstance, JobEngineConfig engineConfig
         content = content.replaceAll("\\$\\{submitter\\}", jobInstance.getSubmitter());
         content = content.replaceAll("\\$\\{error_log\\}", logMsg);
 
+        
         MailService mailService = new MailService();
         try {
             List<String> users = new ArrayList<String>();
@@ -399,8 +400,16 @@ protected void notifyUsers(JobInstance jobInstance, JobEngineConfig engineConfig
                 }
             }
 
+            log.info("prepare to send email to:"+users);
+            
+            log.info("job name:"+jobInstance.getName());
+            log.info("submitter:"+jobInstance.getSubmitter());
+            
+            
             if (users.size() > 0) {
+                log.info("notify list:"+users);
                 mailService.sendMail(users, "["+ finalStatus + "] - [Kylin Cube Build Job]-" + cubeName, content);
+                log.info("notified users:"+users);
             }
         } catch (IOException e) {
             log.error(e.getLocalizedMessage(), e);
diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index 0fc881f..47f62fc 100644
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $location, $templateCache, $interpolate, MessageService, TableService, CubeDescService, CubeService, loadingRequest, SweetAlert) {
+KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $location, $templateCache, $interpolate, MessageService, TableService, CubeDescService, CubeService, loadingRequest, SweetAlert,$log) {
 
     //add or edit ?
     var absUrl = $location.absUrl();
@@ -280,17 +280,19 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
 
 
     function reGenerateRowKey(){
-        console.log("reGen rowkey & agg group");
+        $log.log("reGen rowkey & agg group");
         var tmpRowKeyColumns = [];
         var tmpAggregationItems = [];
         var hierarchyItems = [];
         angular.forEach($scope.cubeMetaFrame.dimensions, function (dimension, index) {
             if (dimension.column == '{FK}' && dimension.join && dimension.join.foreign_key.length > 0) {
                 angular.forEach(dimension.join.foreign_key, function (fk, index) {
+
                     for (var i = 0; i < tmpRowKeyColumns.length; i++) {
                         if(tmpRowKeyColumns[i].column == fk)
                             break;
                     }
+                    // push to array if no duplicate value
                     if(i == tmpRowKeyColumns.length) {
                         tmpRowKeyColumns.push({
                             "column": fk,
@@ -298,8 +300,9 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
                             "dictionary": "true",
                             "mandatory": false
                         });
+
+                        tmpAggregationItems.push(fk);
                     }
-                    tmpAggregationItems.push(fk);
                 });
             }
             else if (dimension.column) {
@@ -314,8 +317,8 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
                         "dictionary": "true",
                         "mandatory": false
                     });
+                    tmpAggregationItems.push(dimension.column);
                 }
-                tmpAggregationItems.push(dimension.column);
             }
             if (dimension.hierarchy && dimension.hierarchy.length > 0) {
                 angular.forEach(dimension.hierarchy, function (hierarchy, index) {
@@ -330,10 +333,11 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
                             "dictionary": "true",
                             "mandatory": false
                         });
-                    }
-
                     tmpAggregationItems.push(hierarchy.column);
-                    hierarchyItems.push(hierarchy.column);
+                    }
+                    if(hierarchyItems.indexOf(hierarchy.column)==-1){
+                        hierarchyItems.push(hierarchy.column);
+                    }
                 });
             }
 
diff --git a/webapp/app/js/controllers/page.js b/webapp/app/js/controllers/page.js
index 3e8a75a..c34ca7b 100644
--- a/webapp/app/js/controllers/page.js
+++ b/webapp/app/js/controllers/page.js
@@ -1,6 +1,6 @@
 'use strict';
 
-KylinApp.controller('PageCtrl', function ($scope, $q, AccessService,$modal, $location, $rootScope, $routeParams, $http, UserService,ProjectService,SweetAlert,$cookieStore) {
+KylinApp.controller('PageCtrl', function ($scope, $q, AccessService,$modal, $location, $rootScope, $routeParams, $http, UserService,ProjectService,SweetAlert,$cookieStore,$log) {
 
     $scope.header = {show: true};
     $scope.footer = {
@@ -155,7 +155,7 @@ KylinApp.controller('PageCtrl', function ($scope, $q, AccessService,$modal, $loc
 
     $scope.$watch('project.selectedProject', function (newValue, oldValue) {
         if(newValue){
-            console.log("project updated in page controller");
+            $log.log("project updated in page controller");
             $cookieStore.put("project",$scope.project.selectedProject);
         }