aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject [40/50] [abbrv] git commit: Code review feedback.
Date Sat, 05 Apr 2014 00:05:26 GMT
Code review feedback.


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/48d37403
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/48d37403
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/48d37403

Branch: refs/heads/mansu/job_page
Commit: 48d37403b28b87c162e39eed3548497ab07f5e25
Parents: 11dd162
Author: Suman Karumuri <skarumuri@twitter.com>
Authored: Wed Apr 2 16:02:41 2014 -0700
Committer: Suman Karumuri <skarumuri@twitter.com>
Committed: Wed Apr 2 16:02:41 2014 -0700

----------------------------------------------------------------------
 .../aurora/scheduler/http/ServletModule.java    |  3 +-
 .../aurora/scheduler/http/ui/js/controllers.js  | 29 ++++++++++++++------
 .../aurora/scheduler/http/ui/js/filters.js      |  8 +++---
 3 files changed, 25 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/48d37403/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
index 00d1e98..9831012 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
@@ -67,8 +67,7 @@ public class ServletModule extends AbstractModule {
 
     // Bindings required for the leader redirector.
     requireBinding(LocalServiceRegistry.class);
-    requireBinding(Key.get(new TypeLiteral<DynamicHostSet<ServiceInstance>>()
{
-    }));
+    requireBinding(Key.get(new TypeLiteral<DynamicHostSet<ServiceInstance>>()
{ }));
     Registration.registerServletFilter(binder(), GuiceFilter.class, "/*");
     install(new JerseyServletModule() {
       private void registerJerseyEndpoint(String indexPath, Class<?>... servlets) {

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/48d37403/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
index 7c07e21..fef9956 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
@@ -88,7 +88,8 @@ auroraUIControllers.controller('JobSummaryController',
       {label: 'Job Name', map: 'jobName'},
       {label: 'Tasks', map: 'tasks'},
       {label: 'Schedule', map: 'schedule'},
-      {label: 'Next Run', map: 'nextCronRun',
+      {label: 'Next Run',
+        map: 'nextCronRun',
         formatFunction: function (value, format) {
           return printDate(value);
         }
@@ -272,12 +273,18 @@ auroraUIControllers.controller('JobController',
 
     $scope.taskSummary = [];
     $scope.taskSummaryTableColumns = [
-      {label: 'Instances', map: 'range', isSortable: false,
+      {label: 'Instances',
+        map: 'range',
+        isSortable: false,
         formatFunction: function (range) {
           return range.start === range.end ? range.start : range.start + '-' + range.end;
-        }},
-      {label: 'Details', map: 'schedulingDetail', isSortable: false,
-        cellTemplateUrl: '/schedulingDetail.html'}
+        }
+      },
+      {label: 'Details',
+        map: 'schedulingDetail',
+        isSortable: false,
+        cellTemplateUrl: '/schedulingDetail.html'
+      }
     ];
 
     $scope.taskSummaryTableConfig = summaryTableConfig;
@@ -298,10 +305,12 @@ auroraUIControllers.controller('JobController',
     var taskColumns = [
       {label: 'Instance', map: 'instanceId'},
       {label: 'Status', map: 'status', cellTemplateUrl: '/taskStatus.html'},
-      {label: 'Last Active', map: 'latestActivity',
+      {label: 'Last Active',
+        map: 'latestActivity',
         formatFunction: function (date) {
           return moment(date).fromNow();
-        }},
+        }
+      },
       {label: 'Host', map: 'host', cellTemplateUrl: '/taskSandbox.html'},
       {label: '', map: 'taskId', cellTemplateUrl: '/taskLink.html'}
     ];
@@ -311,10 +320,12 @@ auroraUIControllers.controller('JobController',
     $scope.completedTasksTableColumns = _.union(
       _.first(taskColumns, 2),
       [
-        {label: 'Running duration', map: 'duration',
+        {label: 'Running duration',
+          map: 'duration',
           formatFunction: function (duration) {
             return moment(moment().subtract(duration)).fromNow(true);
-          }}
+          }
+        }
       ],
       _.last(taskColumns, taskColumns.length - 2)
     );

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/48d37403/src/main/resources/org/apache/aurora/scheduler/http/ui/js/filters.js
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/filters.js b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/filters.js
index 931b9ee..0bde9fb 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/filters.js
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/filters.js
@@ -6,8 +6,8 @@ auroraUI.filter('scheduleStatusTooltip', function () {
       PENDING: 'The scheduler is searching for a machine that satisfies the resources and
'
         + 'constraints for this task.',
 
-      THROTTLED: 'The task will be rescheduled, but is being throttled for restarting too
' +
-        'frequently.',
+      THROTTLED: 'The task will be rescheduled, but is being throttled for restarting too
'
+        + 'frequently.',
 
       ASSIGNED: 'The scheduler has selected a machine to run the task and is instructing
the '
         + 'slave to launch it.',
@@ -19,8 +19,8 @@ auroraUI.filter('scheduleStatusTooltip', function () {
       KILLED: 'A user or cron invocation terminated the task.',
       PREEMPTING: 'This task is being killed to make resources available for a production
task.',
       KILLING: 'A user request or cron invocation has requested the task be killed.',
-      LOST: 'The task cannot be accounted for, usually a result of slave process or machine
' +
-        'failure.'
+      LOST: 'The task cannot be accounted for, usually a result of slave process or machine
'
+        + 'failure.'
     };
 
     return states[value] ? states[value] : value;


Mime
View raw message