pmux-logview 0.2.2 → 0.3.0

data/lib/pmux-logview/log_parser.rb

@@ -28,6 +28,8 @@ module Pmux
       @@task_welapse_re = Regexp.new("^  welapse:")
       @@task_elapse_re = Regexp.new("^  elapse:")
       @@job_finished_at_re = Regexp.new("^:job_finished_at:")
+      @@error_status_re = Regexp.new("^:error_status:")
+      @@error_message_re = Regexp.new("^:error_message:")
       @@quote_re = Regexp.new("^['\"]|['\"]$")
 
       @logger = nil
@@ -58,7 +60,7 @@ module Pmux
               start_time = DateTime::parse(value.strip())
               job["start_time_msec"] = start_time.strftime("%Q") 
               job["start_time"] = start_time.strftime("%Y-%m-%d %H:%M:%S")
-            elsif doc_cnt == 1 && @@map_tasks_re =~ ln
+            elsif doc_cnt == 1 && (@@map_tasks_re =~ ln ||  @@reduce_tasks_re =~ ln)
               empty, key, value = ln.split(":", 3)
               job[key] = value.strip().to_i()
             elsif doc_cnt == 1 && @@mapper_re =~ ln
@@ -72,6 +74,13 @@ module Pmux
               job["end_time_msec"] = end_time.strftime("%Q") 
               job["end_time"] = end_time.strftime("%Y-%m-%d %H:%M:%S")
               cachable = true
+            elsif doc_cnt == 3 && @@error_status_re =~ ln
+              empty, key, value = ln.split(":", 3)
+              job[key] = value.strip()
+              cachable = true
+            elsif doc_cnt == 3 && @@error_message_re =~ ln
+              empty, key, value = ln.split(":", 3)
+              job[key] = value.strip().gsub(@@quote_re, "")
             end
           }
         }
@@ -318,26 +327,20 @@ module Pmux
             return nil
           end
         end
-        #begin
-          #f = File.open(file_path)
-          #docs = YAML::load_stream(f)
-          docs = full_parse(file_path)
-          parse_data = []
-          for idx in [0, 1, 2]
-            if idx == 0 && !docs[idx].nil?
-              docs[idx]["job_started_at_msec"] = docs[idx]["job_started_at"].strftime("%Q") if !docs[idx]["job_started_at"].nil?
-            elsif idx == 2 && !docs[idx].nil?
-              docs[idx]["job_finished_at_msec"] = docs[idx]["job_finished_at"].strftime("%Q") if !docs[idx]["job_finished_at"].nil?
-            end
-            if docs[idx].nil?
-                parse_data.push({})
-            else
-                parse_data.push(docs[idx])
-            end
+        docs = full_parse(file_path)
+        parse_data = []
+        for idx in [0, 1, 2]
+          if idx == 0 && !docs[idx].nil?
+            docs[idx]["job_started_at_msec"] = docs[idx]["job_started_at"].strftime("%Q") if !docs[idx]["job_started_at"].nil?
+          elsif idx == 2 && !docs[idx].nil?
+            docs[idx]["job_finished_at_msec"] = docs[idx]["job_finished_at"].strftime("%Q") if !docs[idx]["job_finished_at"].nil?
           end
-        #ensure
-        #  f.close() if !f.nil?
-        #end
+          if docs[idx].nil?
+              parse_data.push({})
+          else
+              parse_data.push(docs[idx])
+          end
+        end
         return parse_data
       end
 

data/lib/pmux-logview/static/css/pmux-logview.css

@@ -133,7 +133,7 @@ table.dataTable tr.even td.sorting_3 { background-color: #E9F9FF; }
 #task-tooltip {
     position: absolute ! important;
     opacity: 0.94;
-    z-index: 10;
+    z-index: 100;
     font-family: sans-serif;
     font-size: 16px;
 }

data/lib/pmux-logview/static/js/pmux-logview-base.js

@@ -19,6 +19,11 @@ pmux_logview.ajax_base = function(url, method, param) {
     });
 };
 
+pmux_logview.html_escape = function(text) {
+    var dummy = document.createElement('div'); 
+    return $(dummy).text(text).html().replace(/"/g, """)
+};
+
 pmux_logview.get_user_name = function() {
     return this.$user_name.text();
 };
@@ -53,7 +58,11 @@ pmux_logview.update_reload_button = function() {
 
 pmux_logview.open_tooltip = function(html, target, event) {
     var $target = $(target);
-    var target_height = ($target.attr("height") / 2);
+    base_height = $target.attr("height");
+    if (base_height == undefined) {
+        base_height = 0;
+    }
+    var target_height = (base_height);
     this.$task_tooltip.html(html).show();
     var doc_height = this.$task_tooltip.outerHeight();
     var doc_width = this.$task_tooltip.outerWidth();
@@ -62,8 +71,13 @@ pmux_logview.open_tooltip = function(html, target, event) {
     if (event.pageX + doc_width > window_width) {
         x_adjust = event.pageX + doc_width - window_width + 4;
     }
-    this.$task_tooltip.css("top", event.layerY - target_height - doc_height)
-                           .css("left", event.layerX - x_adjust);
+    var base_x = event.layerX;
+    var base_y = event.layerY;
+    if (base_x == undefined) {
+        base_x = event.pageX;
+        base_y = event.pageY - 100; // offset
+    }
+    this.$task_tooltip.css("top", base_y - target_height - doc_height).css("left", base_x - x_adjust);
 };
 
 pmux_logview.open_dialog = function(html) {
@@ -83,11 +97,12 @@ pmux_logview.initialize = function() {
     });
     $("body").click(function(e) {
         var $target = $(e.target);
-        var svg_class = $target.attr("class");
-        if (svg_class != "actorsSwimlaneChartTaskRect" &&
-            svg_class != "tasksGanttChartTaskRect" &&
-            svg_class != "tasksBarChartTaskRect" &&
-            !$target.hasClass("task-tooltip")) {
+        var target_class = $target.attr("class");
+        if (target_class != "actorsSwimlaneChartTaskRect" &&
+            target_class != "tasksGanttChartTaskRect" &&
+            target_class != "tasksBarChartTaskRect" &&
+            !$target.hasClass("task-tooltip") &&
+            !$target.hasClass("error-info")) {
             self.$task_tooltip.hide();
         }
     });

data/lib/pmux-logview/static/js/pmux-logview-detail.js

@@ -34,14 +34,14 @@ pmux_logview.detail.draw_detail_job_chat = function() {
                 var params_html = "";
                 for (params_key in data[0][data_key]) {
                     params_html += '<td class="border">' + params_key + '</td>';
-                    params_html += '<td class="border">' + data[0][data_key][params_key] + '</td>';
+                    params_html += '<td class="border">' + this.parent.html_escape(data[0][data_key][params_key]) + '</td>';
                     params_html += '</tr><tr>'
                     cnt += 1;
                 }
                 table_html += '<td class="border" rowspan="' + cnt + '">' + data_key + '</td>' + params_html;
             } else {
                 table_html += '<td class="border" colspan="2">' + data_key  + '</td>';
-                table_html += '<td class="border">' + data[0][data_key]  + '</td>';
+                table_html += '<td class="border">' +  this.parent.html_escape(data[0][data_key])  + '</td>';
                 table_html += '</tr><tr>';
             }
         }
@@ -52,7 +52,7 @@ pmux_logview.detail.draw_detail_job_chat = function() {
         }
         for (data_key in data[2]) {
             table_html += '<td class="border" colspan="2">' + data_key  + '</td>';
-            table_html += '<td class="border">' + data[2][data_key]  + '</td>';
+            table_html += '<td class="border">' + this.parent.html_escape(data[2][data_key]) + '</td>';
             table_html += '</tr><tr>';
         }
     }

data/lib/pmux-logview/static/js/pmux-logview-index.js

@@ -24,7 +24,7 @@ pmux_logview.index = {
     $dispatcher_log_table:             null,
     $more_button:                      null,
     $job_chart_tchart:                 null,
-    max_mapper_length:                 60 
+    max_mapper_length:                 35
 };
 
 pmux_logview.index.draw_job_chart = function() {
@@ -124,15 +124,24 @@ pmux_logview.index.reload_job_log = function(force) {
         for (i = 0; i < sorted_jobs.length; i++) {
             var row_array = []
             var job_id_html = '';
-            job_id_html += '<button class="container button-color button-normalize ui-corner-all" onClick="pmux_logview.index.open_detail(\'' + sorted_jobs[i]["job_id"] + '\')">';
-            job_id_html += '    <span class="icon-space">' + sorted_jobs[i].job_id + '</span>';
+            job_id_html += '<button class="detail-button container button-color button-normalize ui-corner-all" data-job-id="' + sorted_jobs[i]["job_id"] + '">';
+            if ("error_status" in sorted_jobs[i]) {
+                job_id_html += '    <span class="icon-space"><font color="red">' + sorted_jobs[i].job_id + '</font></span>';
+            } else {
+                job_id_html += '    <span class="icon-space">' + sorted_jobs[i].job_id + '</span>';
+            }
             job_id_html += '    </span><span class="button-icon-adjust ui-icon ui-icon-info"></span>';
             job_id_html += '</button>';
+            if ("error_status" in sorted_jobs[i]) {
+                job_id_html += '<button class="error-button error-info button-color button-normalize ui-corner-all" data-error-status="' + sorted_jobs[i].error_status  + '" data-error-message="' +  self.parent.html_escape(sorted_jobs[i].error_message) + '">';
+                job_id_html += '<div class="error-info ui-state-error"><span class="error-info ui-icon ui-icon-alert"></span></div>';
+                job_id_html += '</button>';
+            } 
             row_array.push(job_id_html)
             if (sorted_jobs[i].mapper.length > self.max_mapper_length) {
-                row_array.push('<span class="text-ellipsis">'+ sorted_jobs[i].mapper.substring(0, self.max_mapper_length) + '...</span>');
+                row_array.push('<span class="text-ellipsis">'+ self.parent.html_escape(sorted_jobs[i].mapper.substring(0, self.max_mapper_length)) + '...</span>');
             } else {
-                row_array.push('<span class="text-ellipsis">'+ sorted_jobs[i].mapper + '</span>');
+                row_array.push('<span class="text-ellipsis">'+ self.parent.html_escape(sorted_jobs[i].mapper) + '</span>');
             }
             row_array.push('<span class="cell-nowrap">' + sorted_jobs[i].start_time + '</span>');
             if (sorted_jobs[i].end_time.match(/^\d+%$/)) {
@@ -260,6 +269,11 @@ pmux_logview.index.initialize = function() {
                               bJQueryUI: true,
                               bAutoWidth: true,
                               sPaginationType: "full_numbers",
+                              fnRowCallback: function(nRow) {
+                                  if (nRow.cells[0]) nRow.cells[0].noWrap = true;
+                                  if (nRow.cells[1]) nRow.cells[1].noWrap = true;
+                                  return nRow
+                              },
                               fnDrawCallback: function() { 
                                   self.update_progress_bar();
                                   var $this = (this)
@@ -274,6 +288,20 @@ pmux_logview.index.initialize = function() {
                                           self.reload_job_log(true);
                                       }
                                   }
+                                  self.$error_button = $(".error-button").click(function(event) {
+                                                           var html = '<table class="border task-tooltip"><thead class="task-tooltip"></thead>';
+                                                           html += '<tbody class="task-tooltip"><tr class="task-tooltip">';
+                                                           html += '<td class="task-tooltip">status</td>';
+                                                           html += '<td class="task-tooltip">' + $(event.currentTarget).attr("data-error-status") +'</td>';
+                                                           html += '</tr><tr class="task-tooltip">';
+                                                           html += '<td class="task-tooltip">status</td>';
+                                                           html += '<td class="task-tooltip">' + $(event.currentTarget).attr("data-error-message") +'</td>';
+                                                           html += '</tr></tbody></table>';
+                                                           self.parent.open_tooltip(html, event.target, event);
+                                                       });
+                                  self.$detail_button = $(".detail-button").click(function(event) {
+                                                           self.open_detail($(event.currentTarget).attr("data-job-id"));
+                                                       });
                               } 
                          });
     this.$dispatcher_log_table = $("#dispatcher-log-table").dataTable({

data/lib/pmux-logview/version.rb

@@ -1,5 +1,5 @@
 module Pmux
   module LogView
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

data/rpm/pmux-logview

@@ -27,7 +27,7 @@ fi
 prog=pmux-logview
 exec=${PMUX_LOGVIEW-/usr/local/bin/pmux-logview}
 config=${CONFIG-/etc/pmux-logview/pmux-logview.conf}
-user=${USER-root}
+user=${PMUX_LOGVIEW_USER-root}
 pidfile=${PIDFILE-/var/run/pmux-logview.pid}
 lockfile=${LOCKFILE-/var/lock/subsys/pmux-logview}
 [ -e /etc/sysconfig/${prog} ] && . /etc/sysconfig/${prog}

data/rpm/pmux-logview.spec

@@ -5,7 +5,7 @@
 %define ruby_verid %{_ruby_verid}
 %endif
 %define rbname pmux-logview
-%define version 0.2.2
+%define version 0.3.0
 %define release 1
 
 Summary: Pmux log viewer

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - hiroyuki kakine
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-15 00:00:00 +09:00
+date: 2013-05-28 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency