pmux-logview 0.3.3 → 0.3.4
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/pmux-logview/log_parser.rb +13 -14
- data/lib/pmux-logview/static/js/pmux-logview-detail.js +2 -2
- data/lib/pmux-logview/static/js/pmux-logview-index.js +3 -3
- data/lib/pmux-logview/version.rb +1 -1
- data/lib/pmux-logview/views/detail.erb +13 -13
- data/lib/pmux-logview/views/index.erb +13 -13
- data/rpm/pmux-logview.spec +1 -1
- metadata +4 -4
@@ -275,11 +275,20 @@ module Pmux
|
|
275
275
|
def full_parse file_path
|
276
276
|
documents = []
|
277
277
|
File.open(file_path) {|f|
|
278
|
+
doc1_buffer = ""
|
279
|
+
doc1_param = {}
|
278
280
|
doc_cnt = 0
|
279
281
|
new_doc = nil
|
280
282
|
task_id = nil
|
281
283
|
f.each_line {|ln|
|
282
284
|
if @@document_re =~ ln
|
285
|
+
if doc_cnt == 1
|
286
|
+
new_doc = YAML.load(doc1_buffer)
|
287
|
+
new_doc[:job_started_at] = doc1_param["job_started_at"] if doc1_param["job_started_at"]
|
288
|
+
new_doc[:invoked_at] = doc1_param["invoked_at"] if doc1_param["invoked_at"]
|
289
|
+
new_doc[:start_time] = doc1_param["start_time"] if doc1_param["start_time"]
|
290
|
+
print new_doc
|
291
|
+
end
|
283
292
|
if !new_doc.nil?
|
284
293
|
new_doc.delete(task_id) if doc_cnt == 2 && !task_id.nil? && new_doc[task_id].length < 5
|
285
294
|
documents.push(new_doc)
|
@@ -290,19 +299,9 @@ module Pmux
|
|
290
299
|
elsif doc_cnt == 1 && (@@job_started_at_re =~ ln || @@invoked_at_re =~ ln || @@start_time_re =~ ln)
|
291
300
|
empty, key, value = ln.split(":", 3)
|
292
301
|
time = DateTime::parse(value.strip())
|
293
|
-
|
294
|
-
elsif doc_cnt == 1
|
295
|
-
|
296
|
-
new_doc[key] = value.strip().to_i()
|
297
|
-
elsif doc_cnt == 1 && @@params_re =~ ln
|
298
|
-
empty, key, value = ln.split(":", 3)
|
299
|
-
new_doc["params"] = {}
|
300
|
-
elsif doc_cnt == 1 && @@header_re =~ ln
|
301
|
-
empty, key, value = ln.split(":", 3)
|
302
|
-
new_doc[key] = value.strip().gsub(@@quote_re, "")
|
303
|
-
elsif doc_cnt == 1 && @@header_params_re =~ ln
|
304
|
-
empty, key, value = ln.split(":", 3)
|
305
|
-
new_doc["params"][key] = value.strip().gsub(@@quote_re, "")
|
302
|
+
doc1_param[key] = time
|
303
|
+
elsif doc_cnt == 1
|
304
|
+
doc1_buffer += ln
|
306
305
|
elsif doc_cnt == 2 && @@task_id_re =~ ln
|
307
306
|
task_id, empty = ln.split(":", 2)
|
308
307
|
new_doc[task_id] = {}
|
@@ -347,7 +346,7 @@ module Pmux
|
|
347
346
|
parse_data = []
|
348
347
|
for idx in [0, 1, 2]
|
349
348
|
if idx == 0 && !docs[idx].nil?
|
350
|
-
docs[idx][
|
349
|
+
docs[idx][:job_started_at_msec] = docs[idx][:job_started_at].strftime("%Q") if !docs[idx][:job_started_at].nil?
|
351
350
|
elsif idx == 2 && !docs[idx].nil?
|
352
351
|
docs[idx]["job_finished_at_msec"] = docs[idx]["job_finished_at"].strftime("%Q") if !docs[idx]["job_finished_at"].nil?
|
353
352
|
end
|
@@ -47,7 +47,7 @@ pmux_logview.detail.draw_detail_job_chat = function() {
|
|
47
47
|
}
|
48
48
|
}
|
49
49
|
if (data.length >= 3) {
|
50
|
-
if ("job_finished_at" in data[2]) {
|
50
|
+
if ("job_finished_at" in data[2] || "error_status" in data[2]) {
|
51
51
|
this.parent.update_reload_button();
|
52
52
|
}
|
53
53
|
for (data_key in data[2]) {
|
@@ -101,7 +101,7 @@ pmux_logview.detail.reload_job_log_detail = function() {
|
|
101
101
|
return
|
102
102
|
}
|
103
103
|
var self = this;
|
104
|
-
var url = "
|
104
|
+
var url = "log/job/" + this.get_job_id() + "/detail";
|
105
105
|
this.parent.ajax_base(url, "GET", {}).done(function(data, textStatus, XMLHttpRequest) {
|
106
106
|
self.ajax_data = data;
|
107
107
|
self.draw_detail_job_chat();
|
@@ -67,7 +67,7 @@ pmux_logview.index.draw_job_chart = function() {
|
|
67
67
|
}
|
68
68
|
|
69
69
|
pmux_logview.index.open_detail = function(job_id) {
|
70
|
-
window.open("
|
70
|
+
window.open("detail?job_id=" + job_id, "_blank");
|
71
71
|
};
|
72
72
|
|
73
73
|
pmux_logview.index.update_progress_bar = function() {
|
@@ -92,7 +92,7 @@ pmux_logview.index.reload_job_log = function(force) {
|
|
92
92
|
nitems: this.job_log_nitems,
|
93
93
|
page: this.job_log_page,
|
94
94
|
jobs_cookie: this.job_log_jobs_cookie };
|
95
|
-
this.parent.ajax_base("
|
95
|
+
this.parent.ajax_base("log/job", "GET", param).done(function(data, textStatus, XMLHttpRequest) {
|
96
96
|
if (!("jobs_cookie" in data && "jobs" in data)) {
|
97
97
|
self.$job_log_table.fnClearTable();
|
98
98
|
self.$job_log_table.fnAddData(["invalid response", "", "", "", ""]);
|
@@ -175,7 +175,7 @@ pmux_logview.index.reload_dispatcher_log = function() {
|
|
175
175
|
return;
|
176
176
|
}
|
177
177
|
var self = this;
|
178
|
-
this.parent.ajax_base("
|
178
|
+
this.parent.ajax_base("log/dispatcher", "GET", {}).done(function(data, textStatus, XMLHttpRequest) {
|
179
179
|
self.$dispatcher_log_table.fnClearTable();
|
180
180
|
var body_array = [];
|
181
181
|
for (var i = data.length - 1; i >= 0; i--) {
|
data/lib/pmux-logview/version.rb
CHANGED
@@ -3,19 +3,19 @@
|
|
3
3
|
<head>
|
4
4
|
<title>pmux logview</title>
|
5
5
|
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
|
6
|
-
<link rel="stylesheet" type="text/css" href="
|
7
|
-
<script type="text/javascript" src="
|
8
|
-
<script type="text/javascript" src="
|
9
|
-
<script type="text/javascript" src="
|
10
|
-
<script type="text/javascript" src="
|
11
|
-
<script type="text/javascript" src="
|
12
|
-
<script type="text/javascript" src="
|
13
|
-
<script type="text/javascript" src="
|
14
|
-
<script type="text/javascript" src="
|
15
|
-
<link rel="stylesheet" type="text/css" href="
|
16
|
-
<link rel="stylesheet" type="text/css" href="
|
17
|
-
<link rel="stylesheet" type="text/css" href="
|
18
|
-
<link rel="stylesheet" type="text/css" href="
|
6
|
+
<link rel="stylesheet" type="text/css" href="css/normalize.css" />
|
7
|
+
<script type="text/javascript" src="js/jquery-1.9.1.js"></script>
|
8
|
+
<script type="text/javascript" src="js/jquery-ui-1.10.0.js"></script>
|
9
|
+
<script type="text/javascript" src="js/jquery.dataTables.min.js"></script>
|
10
|
+
<script type="text/javascript" src="js/d3.v3.min.js"></script>
|
11
|
+
<script type="text/javascript" src="js/jquery.activity-indicator-1.0.0.min.js"></script>
|
12
|
+
<script type="text/javascript" src="js/tchart.js"></script>
|
13
|
+
<script type="text/javascript" src="js/pmux-logview-base.js"></script>
|
14
|
+
<script type="text/javascript" src="js/pmux-logview-detail.js"></script>
|
15
|
+
<link rel="stylesheet" type="text/css" href="css/jquery-ui-1.10.0.css" />
|
16
|
+
<link rel="stylesheet" type="text/css" href="css/jquery.dataTables.css" />
|
17
|
+
<link rel="stylesheet" type="text/css" href="css/tchart.css" />
|
18
|
+
<link rel="stylesheet" type="text/css" href="css/pmux-logview.css" />
|
19
19
|
</head>
|
20
20
|
<body class="body-font background-gradient background-no-repeat">
|
21
21
|
<div id="detail-title">
|
@@ -3,19 +3,19 @@
|
|
3
3
|
<head>
|
4
4
|
<title>pmux logview</title>
|
5
5
|
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
|
6
|
-
<link rel="stylesheet" type="text/css" href="
|
7
|
-
<script type="text/javascript" src="
|
8
|
-
<script type="text/javascript" src="
|
9
|
-
<script type="text/javascript" src="
|
10
|
-
<script type="text/javascript" src="
|
11
|
-
<script type="text/javascript" src="
|
12
|
-
<script type="text/javascript" src="
|
13
|
-
<script type="text/javascript" src="
|
14
|
-
<script type="text/javascript" src="
|
15
|
-
<link rel="stylesheet" type="text/css" href="
|
16
|
-
<link rel="stylesheet" type="text/css" href="
|
17
|
-
<link rel="stylesheet" type="text/css" href="
|
18
|
-
<link rel="stylesheet" type="text/css" href="
|
6
|
+
<link rel="stylesheet" type="text/css" href="css/normalize.css" />
|
7
|
+
<script type="text/javascript" src="js/jquery-1.9.1.js"></script>
|
8
|
+
<script type="text/javascript" src="js/jquery-ui-1.10.0.js"></script>
|
9
|
+
<script type="text/javascript" src="js/jquery.dataTables.min.js"></script>
|
10
|
+
<script type="text/javascript" src="js/d3.v3.min.js"></script>
|
11
|
+
<script type="text/javascript" src="js/jquery.activity-indicator-1.0.0.min.js"></script>
|
12
|
+
<script type="text/javascript" src="js/tchart.js"></script>
|
13
|
+
<script type="text/javascript" src="js/pmux-logview-base.js"></script>
|
14
|
+
<script type="text/javascript" src="js/pmux-logview-index.js"></script>
|
15
|
+
<link rel="stylesheet" type="text/css" href="css/jquery-ui-1.10.0.css" />
|
16
|
+
<link rel="stylesheet" type="text/css" href="css/jquery.dataTables.css" />
|
17
|
+
<link rel="stylesheet" type="text/css" href="css/tchart.css" />
|
18
|
+
<link rel="stylesheet" type="text/css" href="css/pmux-logview.css" />
|
19
19
|
</head>
|
20
20
|
<body class="body-font background-gradient background-no-repeat">
|
21
21
|
<div>
|
data/rpm/pmux-logview.spec
CHANGED
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: pmux-logview
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 27
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 3
|
9
|
-
-
|
10
|
-
version: 0.3.
|
9
|
+
- 4
|
10
|
+
version: 0.3.4
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- hiroyuki kakine
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2013-06-
|
18
|
+
date: 2013-06-13 00:00:00 +09:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|