pmux-gw 0.1.11 → 0.1.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/lib/pmux-gw/history.rb +13 -6
  2. data/lib/pmux-gw/http_handler.rb +2 -2
  3. data/lib/pmux-gw/version.rb +1 -1
  4. data/rpm/pmux-gw.spec +4 -43
  5. metadata +4 -4
data/lib/pmux-gw/history.rb CHANGED
@@ -97,14 +97,21 @@ module Pmux
97
97
  end
98
98
  end
99
99
 
100
- def is_skip elems, peername, pid, mapper, start_datetime
101
- return true if !peername.nil? && peername != "" && /#{peername}/ !~ elems[1]
102
- return true if !pid.nil? && pid != "" && /#{pid}/ !~ elems[3]
103
- return true if !mapper.nil? && mapper != "" && /#{mapper}/ !~ elems[4]
100
+ def is_skip elems, peername, pid, mapper, start_datetime, use_regex
101
+ if use_regex
102
+ return true if !peername.nil? && peername != "" && /#{peername}/ !~ elems[1]
103
+ return true if !pid.nil? && pid != "" && /#{pid}/ !~ elems[3]
104
+ return true if !mapper.nil? && mapper != "" && /#{mapper}/ !~ elems[4]
105
+ else
106
+ return true if !peername.nil? && peername != "" && peername != elems[1]
107
+ return true if !pid.nil? && pid != "" && pid != elems[3]
108
+ return true if !mapper.nil? && mapper != "" && mapper != elems[4]
109
+ end
104
110
  return true if !start_datetime.nil? && start_datetime != "" && start_datetime != elems[5]
111
+ return false
105
112
  end
106
113
 
107
- def load peername, pid, mapper, start_datetime, start_date, end_date, need_command = false, html_escape = false
114
+ def load peername, pid, mapper, start_datetime, start_date, end_date, need_command = false, html_escape = false, use_regex=false
108
115
  # 指定された期間のログファイルからデータを読み込む
109
116
  # フォーマット(タブ区切り):
110
117
  # id\tpeername\tuser\tpid\tmapper\tstart_datetime\tend_datetime\telapsed\tstatus\tcommand\n
@@ -118,7 +125,7 @@ module Pmux
118
125
  open(file_path) {|file|
119
126
  while line = file.gets() do
120
127
  elems = line.chomp().split("\t")
121
- next if is_skip(elems, peername, pid, mapper, start_datetime)
128
+ next if is_skip(elems, peername, pid, mapper, start_datetime, use_regex)
122
129
  id = elems.shift()
123
130
  command = elems.pop() if !need_command
124
131
  elems.unshift(start_date.to_s)
data/lib/pmux-gw/http_handler.rb CHANGED
@@ -315,7 +315,7 @@ module Pmux
315
315
  start_date = default_start_date
316
316
  end_date = default_end_date
317
317
  end
318
- history, history_id_order = @history.load(client, pid, mapper, "", start_date, end_date, false, true)
318
+ history, history_id_order = @history.load(client, pid, mapper, "", start_date, end_date, false, true, true)
319
319
  labels = ["date", "client", "user", "pid", "mapper", "start", "end", "elapsed", "status", "detail" ]
320
320
  # templateがまだ読み込まれてなければtemplateを読み込む
321
321
  if @@history_template.nil?
@@ -358,7 +358,7 @@ module Pmux
358
358
  :content => "invalid date string"})
359
359
  return
360
360
  end
361
- history, history_id_order = @history.load(client, pid, mapper, start_datetime, start_date, end_date, true, false)
361
+ history, history_id_order = @history.load(client, pid, mapper, start_datetime, start_date, end_date, true, false, false)
362
362
  if history_id_order.length < 1
363
363
  error_response({:status => 404,
364
364
  :content_type => "text/plain",
data/lib/pmux-gw/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Pmux
2
2
  module Gateway
3
- VERSION = "0.1.11"
3
+ VERSION = "0.1.12"
4
4
  end
5
5
  end
data/rpm/pmux-gw.spec CHANGED
@@ -5,7 +5,7 @@
5
5
  %define ruby_verid %{_ruby_verid}
6
6
  %endif
7
7
  %define rbname pmux-gw
8
- %define version 0.1.11
8
+ %define version 0.1.12
9
9
  %define release 1
10
10
 
11
11
  Summary: Pmux gateway server
@@ -20,15 +20,13 @@ Source0: %{rbname}-%{version}.gem
20
20
  Source1: %{rbname}
21
21
  BuildRoot: %{_tmppath}/%{name}-%{version}-root
22
22
  Requires: ruby
23
- Requires: rubygems%(echo -n %{ruby_verid}) >= 1.3.7
24
- Requires: rubygem%(echo -n %{ruby_verid})-gflocator >= 0.0.1
25
- Requires: rubygem%(echo -n %{ruby_verid})-pmux >= 0.1.0
23
+ Requires: rubygem%(echo -n %{ruby_verid})-gflocator
24
+ Requires: rubygem%(echo -n %{ruby_verid})-pmux
26
25
  Requires: rubygem%(echo -n %{ruby_verid})-eventmachine => 1.0
27
26
  Requires: rubygem%(echo -n %{ruby_verid})-eventmachine < 2
28
27
  Requires: rubygem%(echo -n %{ruby_verid})-em_pessimistic >= 0.1.2
29
28
  Requires: rubygem%(echo -n %{ruby_verid})-eventmachine_httpserver > 0.2.1
30
29
  BuildRequires: ruby
31
- BuildRequires: rubygems%(echo -n %{ruby_verid}) >= 1.3.7
32
30
  BuildArch: noarch
33
31
  Provides: ruby(Pmux-gateway) = %{version}
34
32
 
@@ -60,44 +58,7 @@ cp %{SOURCE1} %{buildroot}/etc/init.d/
60
58
  %files
61
59
  %defattr(-, root, root)
62
60
  %{_bindir}/pmux-gw
63
- %{gemdir}/gems/%{rbname}-%{version}/Gemfile
64
- %{gemdir}/gems/%{rbname}-%{version}/Makefile
65
- %{gemdir}/gems/%{rbname}-%{version}/LICENSE.txt
66
- %{gemdir}/gems/%{rbname}-%{version}/README.md
67
- %{gemdir}/gems/%{rbname}-%{version}/Rakefile
68
- %{gemdir}/gems/%{rbname}-%{version}/pmux-gw.gemspec
69
- %{gemdir}/gems/%{rbname}-%{version}/bin/pmux-gw
70
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw.rb
71
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/http_handler.rb
72
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/pmux_handler.rb
73
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/template/history.tmpl
74
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/client_context.rb
75
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/application.rb
76
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/version.rb
77
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/history.rb
78
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/jquery-ui-1.9.2.custom.css
79
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-bg_glass_65_ffffff_1x400.png
80
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-icons_cd0a0a_256x240.png
81
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-bg_glass_55_fbf9ee_1x400.png
82
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-icons_2e83ff_256x240.png
83
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-icons_222222_256x240.png
84
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-bg_glass_75_dadada_1x400.png
85
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-icons_454545_256x240.png
86
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-bg_glass_75_e6e6e6_1x400.png
87
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-icons_888888_256x240.png
88
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-bg_flat_0_aaaaaa_40x100.png
89
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-bg_flat_75_ffffff_40x100.png
90
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
91
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-bg_glass_95_fef1ec_1x400.png
92
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/js/jquery-1.8.3.js
93
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/js/jquery-ui-1.9.2.custom.js
94
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/logger_wrapper.rb
95
- %{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/syslog_wrapper.rb
96
- %{gemdir}/gems/%{rbname}-%{version}/conf/pmux-gw.conf
97
- %{gemdir}/gems/%{rbname}-%{version}/conf/password
98
- %{gemdir}/gems/%{rbname}-%{version}/rpm/pmux-gw.spec
99
- %{gemdir}/gems/%{rbname}-%{version}/rpm/pmux-gw
100
- %{gemdir}/gems/%{rbname}-%{version}/rpm/Makefile
61
+ %{gemdir}/gems/%{rbname}-%{version}/
101
62
  %attr(0755,root,root) /etc/init.d/%{rbname}
102
63
 
103
64
  %doc %{gemdir}/doc/%{rbname}-%{version}
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pmux-gw
3
3
  version: !ruby/object:Gem::Version
4
- hash: 13
4
+ hash: 3
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 1
9
- - 11
10
- version: 0.1.11
9
+ - 12
10
+ version: 0.1.12
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-03-07 00:00:00 +09:00
18
+ date: 2013-03-13 00:00:00 +09:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency