#848: Added milli seconds to timestamp in log plugin.

hawtio · Dec 15, 2013 · 164315a · 164315a
1 parent 78fcf00
commit 164315a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/hawtio-web/src/main/webapp/app/log/html/logs.html b/hawtio-web/src/main/webapp/app/log/html/logs.html
@@ -62,7 +62,8 @@
           <div class="title">
             <i class="expandable-indicator"></i>
           </div>
-          <div class="title">{{log.timestamp | logDateFilter}}</div>
+          <!-- TODO: use log.seq as it has timestamp with milli seconds -->
+          <div class="title">{{log.seq | logDateFilter}}</div>
           <div class="title"><span class="text-{{logClass(log)}}"><i class="{{logIcon(log)}}"></i> {{log.level}}</span></div>
           <div title="{{log.logger}}" ng-switch="hasLogSourceHref(log)">
             <a ng-href="{{logSourceHref(log)}}" ng-switch-when="true">{{log.logger}}</a>

diff --git a/hawtio-web/src/main/webapp/app/log/js/logPlugin.ts b/hawtio-web/src/main/webapp/app/log/js/logPlugin.ts
@@ -34,7 +34,7 @@ module Log {
           filter('logDateFilter', function ($filter) {
             var standardDateFilter = $filter('date');
             return function (dateToFormat) {
-              return standardDateFilter(dateToFormat, 'yyyy-MM-dd HH:mm:ss');
+              return standardDateFilter(dateToFormat, 'yyyy-MM-dd HH:mm:ss.sss');
             }
           });
 

diff --git a/hawtio-web/src/main/webapp/app/log/js/logs.ts b/hawtio-web/src/main/webapp/app/log/js/logs.ts
@@ -6,12 +6,11 @@ module Log {
   var log:Logging.Logger = Logger.get("Log");
 
   export interface ILog {
-    // TODO What is the point of seq?
     seq: string;
-    message: string;
     timestamp: string;
-    logger: string;
     level: string;
+    logger: string;
+    message: string;
   }
 
   export function LogController($scope, $routeParams, $location, localStorage, workspace:Workspace, $window, $document) {

diff --git a/hawtio-web/src/main/webapp/css/site-base.css b/hawtio-web/src/main/webapp/css/site-base.css
@@ -2652,7 +2652,7 @@ ul.zebra-list li {
 
 .log-table .table-head div div:nth-child(4) {
   font-weight: bold;
-  left: 225px;
+  left: 247px;
   width: 326px;
   text-align: center !important;
   direction: ltr !important;
@@ -2697,13 +2697,13 @@ ul.zebra-list li {
 .log-table li div div:nth-child(2) {
   border-right: 1px solid #d4d4d4;
   left: 18px;
-  width: 143px;
+  width: 180px;
   z-index: 5;
 }
 
 .log-table li div div:nth-child(3) {
   border-right: 1px solid #d4d4d4;
-  left: 168px;
+  left: 190px;
   width: 60px;
   z-index: 5;
   text-align: center;
@@ -2716,11 +2716,11 @@ ul.zebra-list li {
   direction: rtl;
   z-index: 3;
   left: 0;
-  width: 551px;
+  width: 573px;
 }
 
 .log-table li div div:nth-child(5) {
-  left: 558px;
+  left: 580px;
   right: 0;
   padding-left: 5px;
 }