pmux-gw 0.1.11 → 0.1.12

data/lib/pmux-gw/history.rb

@@ -97,14 +97,21 @@ module Pmux
         end
       end
     
-      def is_skip elems, peername, pid, mapper, start_datetime
-        return true if !peername.nil? && peername != "" &&  /#{peername}/ !~ elems[1]
-        return true if !pid.nil? && pid != "" && /#{pid}/ !~ elems[3]
-        return true if !mapper.nil? && mapper != "" && /#{mapper}/ !~ elems[4]
+      def is_skip elems, peername, pid, mapper, start_datetime, use_regex
+        if use_regex
+          return true if !peername.nil? && peername != "" &&  /#{peername}/ !~ elems[1]
+          return true if !pid.nil? && pid != "" && /#{pid}/ !~ elems[3]
+          return true if !mapper.nil? && mapper != "" && /#{mapper}/ !~ elems[4]
+        else
+          return true if !peername.nil? && peername != "" &&  peername != elems[1]
+          return true if !pid.nil? && pid != "" && pid != elems[3]
+          return true if !mapper.nil? && mapper != "" && mapper != elems[4]
+        end
         return true if !start_datetime.nil? && start_datetime != "" && start_datetime != elems[5] 
+        return false
       end
     
-      def load peername, pid, mapper, start_datetime, start_date, end_date, need_command = false, html_escape = false
+      def load peername, pid, mapper, start_datetime, start_date, end_date, need_command = false, html_escape = false, use_regex=false
         # 指定された期間のログファイルからデータを読み込む
         # フォーマット(タブ区切り):
         #   id\tpeername\tuser\tpid\tmapper\tstart_datetime\tend_datetime\telapsed\tstatus\tcommand\n
@@ -118,7 +125,7 @@ module Pmux
             open(file_path) {|file|
               while line = file.gets() do
                 elems = line.chomp().split("\t")
-                next if is_skip(elems, peername, pid, mapper, start_datetime)
+                next if is_skip(elems, peername, pid, mapper, start_datetime, use_regex)
                 id = elems.shift()
                 command = elems.pop() if !need_command
                 elems.unshift(start_date.to_s)

data/lib/pmux-gw/http_handler.rb

@@ -315,7 +315,7 @@ module Pmux
           start_date = default_start_date
           end_date = default_end_date
         end
-        history, history_id_order = @history.load(client, pid, mapper, "", start_date, end_date, false, true)
+        history, history_id_order = @history.load(client, pid, mapper, "", start_date, end_date, false, true, true)
         labels = ["date", "client", "user", "pid", "mapper", "start", "end", "elapsed", "status", "detail" ]
         # templateがまだ読み込まれてなければtemplateを読み込む
         if @@history_template.nil?
@@ -358,7 +358,7 @@ module Pmux
                           :content => "invalid date string"})
           return
         end
-        history, history_id_order = @history.load(client, pid, mapper, start_datetime, start_date, end_date, true, false)
+        history, history_id_order = @history.load(client, pid, mapper, start_datetime, start_date, end_date, true, false, false)
         if history_id_order.length < 1
           error_response({:status => 404,
                           :content_type => "text/plain",

data/lib/pmux-gw/version.rb

@@ -1,5 +1,5 @@
 module Pmux
   module Gateway
-    VERSION = "0.1.11"
+    VERSION = "0.1.12"
   end
 end

data/rpm/pmux-gw.spec

@@ -5,7 +5,7 @@
 %define ruby_verid %{_ruby_verid}
 %endif
 %define rbname pmux-gw
-%define version 0.1.11
+%define version 0.1.12
 %define release 1
 
 Summary: Pmux gateway server
@@ -20,15 +20,13 @@ Source0: %{rbname}-%{version}.gem
 Source1: %{rbname}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: ruby 
-Requires: rubygems%(echo -n %{ruby_verid}) >= 1.3.7
-Requires: rubygem%(echo -n %{ruby_verid})-gflocator  >= 0.0.1
-Requires: rubygem%(echo -n %{ruby_verid})-pmux >= 0.1.0
+Requires: rubygem%(echo -n %{ruby_verid})-gflocator
+Requires: rubygem%(echo -n %{ruby_verid})-pmux
 Requires: rubygem%(echo -n %{ruby_verid})-eventmachine => 1.0
 Requires: rubygem%(echo -n %{ruby_verid})-eventmachine < 2
 Requires: rubygem%(echo -n %{ruby_verid})-em_pessimistic >= 0.1.2
 Requires: rubygem%(echo -n %{ruby_verid})-eventmachine_httpserver > 0.2.1 
 BuildRequires: ruby 
-BuildRequires: rubygems%(echo -n %{ruby_verid}) >= 1.3.7
 BuildArch: noarch
 Provides: ruby(Pmux-gateway) = %{version}
 
@@ -60,44 +58,7 @@ cp %{SOURCE1} %{buildroot}/etc/init.d/
 %files
 %defattr(-, root, root)
 %{_bindir}/pmux-gw
-%{gemdir}/gems/%{rbname}-%{version}/Gemfile
-%{gemdir}/gems/%{rbname}-%{version}/Makefile
-%{gemdir}/gems/%{rbname}-%{version}/LICENSE.txt
-%{gemdir}/gems/%{rbname}-%{version}/README.md
-%{gemdir}/gems/%{rbname}-%{version}/Rakefile
-%{gemdir}/gems/%{rbname}-%{version}/pmux-gw.gemspec
-%{gemdir}/gems/%{rbname}-%{version}/bin/pmux-gw
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw.rb
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/http_handler.rb
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/pmux_handler.rb
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/template/history.tmpl
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/client_context.rb
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/application.rb
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/version.rb
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/history.rb
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/jquery-ui-1.9.2.custom.css
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-bg_glass_65_ffffff_1x400.png
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-icons_cd0a0a_256x240.png
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-bg_glass_55_fbf9ee_1x400.png
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-icons_2e83ff_256x240.png
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-icons_222222_256x240.png
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-bg_glass_75_dadada_1x400.png
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-icons_454545_256x240.png
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-bg_glass_75_e6e6e6_1x400.png
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-icons_888888_256x240.png
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-bg_flat_0_aaaaaa_40x100.png
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-bg_flat_75_ffffff_40x100.png
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/css/images/ui-bg_glass_95_fef1ec_1x400.png
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/js/jquery-1.8.3.js
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/static/js/jquery-ui-1.9.2.custom.js
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/logger_wrapper.rb
-%{gemdir}/gems/%{rbname}-%{version}/lib/pmux-gw/syslog_wrapper.rb
-%{gemdir}/gems/%{rbname}-%{version}/conf/pmux-gw.conf
-%{gemdir}/gems/%{rbname}-%{version}/conf/password
-%{gemdir}/gems/%{rbname}-%{version}/rpm/pmux-gw.spec
-%{gemdir}/gems/%{rbname}-%{version}/rpm/pmux-gw
-%{gemdir}/gems/%{rbname}-%{version}/rpm/Makefile
+%{gemdir}/gems/%{rbname}-%{version}/
 %attr(0755,root,root) /etc/init.d/%{rbname}
 
 %doc %{gemdir}/doc/%{rbname}-%{version}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pmux-gw
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 1
-  - 11
-  version: 0.1.11
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - Hiroyuki Kakine
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-07 00:00:00 +09:00
+date: 2013-03-13 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency