From 539c436007b2f2fe8c9236285ab770c06461a940 Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Tue, 16 Dec 2014 22:20:23 +0800
Subject: [PATCH] add loadRequest for job resume&discard & update log4j use for
 mailservice

---
 common/src/main/java/com/kylinolap/common/util/MailService.java | 2 +-
 job/src/main/java/com/kylinolap/job/flow/JobFlowListener.java   | 2 +-
 webapp/app/js/controllers/job.js                                | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/kylinolap/common/util/MailService.java b/common/src/main/java/com/kylinolap/common/util/MailService.java
index 1d76ffe..608806c 100644
--- a/common/src/main/java/com/kylinolap/common/util/MailService.java
+++ b/common/src/main/java/com/kylinolap/common/util/MailService.java
@@ -93,7 +93,7 @@ public boolean sendMail(List<String> receivers, String subject, String content)
             email.getMailSession();
 
         } catch (EmailException e) {
-            logger.error(e);
+            logger.error(e.getLocalizedMessage(),e);
             return false;
         }
         
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 faadd65..8274d44 100644
--- a/job/src/main/java/com/kylinolap/job/flow/JobFlowListener.java
+++ b/job/src/main/java/com/kylinolap/job/flow/JobFlowListener.java
@@ -403,8 +403,8 @@ 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());
             
+            log.info("submitter:"+jobInstance.getSubmitter());
             
             if (users.size() > 0) {
                 log.info("notify list:"+users);
diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js
index 69eacac..e297543 100644
--- a/webapp/app/js/controllers/job.js
+++ b/webapp/app/js/controllers/job.js
@@ -1,7 +1,7 @@
 'use strict';
 
 KylinApp
-    .controller('JobCtrl', function ($scope, $q, $routeParams, $interval, $modal, ProjectService, MessageService, JobService,SweetAlert) {
+    .controller('JobCtrl', function ($scope, $q, $routeParams, $interval, $modal, ProjectService, MessageService, JobService,SweetAlert,loadingRequest) {
         $scope.cubeName = null;
         $scope.jobs = {};
         $scope.projects = [];
@@ -111,13 +111,16 @@ KylinApp
                 confirmButtonText: "Yes",
                 closeOnConfirm: true
             }, function() {
+                loadingRequest.show();
                 JobService.resume({jobId: job.uuid}, {}, function (job) {
+                    loadingRequest.hide();
                     $scope.jobs[job.uuid] = job;
                     if (angular.isDefined($scope.state.selectedJob)) {
                         $scope.state.selectedJob = $scope.jobs[ $scope.state.selectedJob.uuid];
                     }
                     SweetAlert.swal('Success!', 'Job has been resumed successfully!', 'success');
                 },function(e){
+                    loadingRequest.hide();
                     if(e.data&& e.data.exception){
                         var message =e.data.exception;
                         var msg = !!(message) ? message : 'Failed to take action.';
@@ -139,13 +142,16 @@ KylinApp
                 confirmButtonText: "Yes",
                 closeOnConfirm: true
             }, function() {
+                loadingRequest.show();
                 JobService.cancel({jobId: job.uuid}, {}, function (job) {
+                    loadingRequest.hide();
                     $scope.jobs[job.uuid] = job;
                     if (angular.isDefined($scope.state.selectedJob)) {
                         $scope.state.selectedJob = $scope.jobs[ $scope.state.selectedJob.uuid];
                     }
                     SweetAlert.swal('Success!', 'Job has been discarded successfully!', 'success');
                 },function(e){
+                    loadingRequest.hide();
                     if(e.data&& e.data.exception){
                         var message =e.data.exception;
                         var msg = !!(message) ? message : 'Failed to take action.';