internethakai 0.2.4 → 0.2.5

data/CHANGES

@@ -1,3 +1,6 @@
+0.2.5:
+* sslに対応
+
 0.2.4:
 * max_process のバグを修正
 * -p(--max-process) オプションを追加

data/lib/internethakai/action.rb

@@ -161,7 +161,7 @@ module InternetHakai
             if response.nil? #レスポンスが空の場合。時間だけ記録
                 @http_client.release
                 @http_client = nil
-                
+
                 log "CONTENT_LENGTH:::", 0
                 @register.regist(@register_key, 0, response, @errorcount)
                 free
@@ -177,7 +177,7 @@ module InternetHakai
                     idx = url.index('/', 8) || url.size
                     path = url[idx, tmp ]
                     path = '/'+path if path[0,1]!='/'
-                    @logger.run(response.body, 4) if response && @errorcount>0 && (response.content_type.include?('text') || response.content_type.include?('xml'))
+                    @logger.run(response.body, 4) if response && @errorcount>0 && (response.content_type.include?('text') || response.content_type.include?('xml') || response.content_type.include?('json'))
                     on_redirect path
                     @redirect += 1
                     @redirect_url = path
@@ -229,7 +229,7 @@ module InternetHakai
                 log "RESPONSE_TIME:::",@rtime
                 #puts "on complete1.1: #{Time::now.usec/1000.to_f}"
 
-                response.body.force_encoding(@opt['encoding']) if @ruby19 and (response.content_type.include?('text') || response.content_type.include?('xml'))
+                response.body.force_encoding(@opt['encoding']) if @ruby19 and (response.content_type.include?('text') || response.content_type.include?('xml') || response.content_type.include?('json'))
                 if(@opt["scan"])
                     check_scan response.body, @opt["scan"]
                 end
@@ -245,7 +245,7 @@ module InternetHakai
                 @debug_msgs << "++++++++++++++++++++++++++++++++++++++\n"
                 @logger.run(@debug_msgs.join("\n")+"\n",3)
                 @debug_msgs = []
-                @logger.run(response.body, 4) if response && (response.content_type.include?('text') || response.content_type.include?('xml'))
+                @logger.run(response.body, 4) if response && (response.content_type.include?('text') || response.content_type.include?('xml') || response.content_type.include?('json'))
                 @logger.run("\r\n+++++++++++++++++++++++++++++++\n", 4)
             ensure
                 free #絶対freeを呼ぶ！

data/lib/internethakai/concurrency_manager.rb

@@ -15,7 +15,11 @@ module InternetHakai
             require 'rev'
             require 'internethakai/hakairev'
             #TimeRegistProcess::run
-            @config['http_client'] = 'RevHttpClient'
+            if @config['ssl']
+                @config['http_client'] = 'RevSslClient'
+            else
+                @config['http_client'] = 'RevHttpClient'
+            end
             @config['scenario_executer'] = 'NonBlockScenarioExecuter'
             @config['request_pool'] = 'RequestPoolNonThread'
             @config['queue'] = 'TaskQueue'
@@ -121,7 +125,7 @@ module InternetHakai
             @scenarios.each do |sc|
                 sc.init
             end
-            Thread.abort_on_exception 
+            Thread.abort_on_exception
             @scenario_handler.set_on_turn_complete &method(:on_complete)
             1.upto(@config["max_request"]) do |th_cnt|
                 @threads[th_cnt] = Thread::new(th_cnt) do |th_cnt|

data/lib/internethakai/hakairev/http_client.rb

@@ -359,4 +359,64 @@ module InternetHakai
             @client_queue.collect(self)
         end
     end
+    class RevSslClient < RevHttpClient
+        require 'rev/ssl'
+        include Rev::SSL
+        def reconnect
+            super
+            context = respond_to?(:ssl_context) ? ssl_context : OpenSSL::SSL::SSLContext.new
+
+            @_ssl_socket = Rev::SSL::IO.new(@_io, context)
+            @_ssl_init = proc { @_ssl_socket.connect_nonblock }
+            @__ssl_inited = true
+
+            begin
+                @_ssl_init.call
+                ssl_init_complete
+            rescue Rev::SSL::IO::ReadAgain
+                enable unless enabled?
+            rescue Rev::SSL::IO::WriteAgain
+                return
+            rescue OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::EPIPE
+                close
+            rescue => ex
+                if respond_to? :on_ssl_error
+                    on_ssl_error(ex)
+                else raise ex
+                end
+            end
+        end
+        def on_writable
+            begin
+                nbytes = @_ssl_socket.write_nonblock @_write_buffer.to_str
+            rescue Errno::EAGAIN, Rev::SSL::IO::WriteAgain, Rev::SSL::IO::ReadAgain
+                return
+            rescue OpenSSL::SSL::SSLError, Errno::EPIPE, Errno::ECONNRESET
+                close
+                return
+            end
+            @_write_buffer.read(nbytes)
+
+            if @_write_buffer.empty?
+                disable_write_watcher
+                on_write_complete
+            end
+        end
+        def on_readable
+            begin
+                on_read @_ssl_socket.read_nonblock(Rev::IO::INPUT_SIZE)
+            rescue Errno::EAGAIN, Rev::SSL::IO::ReadAgain
+                return
+            rescue OpenSSL::SSL::SSLError, Errno::ECONNRESET, EOFError
+                close
+            end
+        end
+        def on_connect
+            unless @__ssl_inited
+                ssl_client_start
+                @__ssl_inited = true
+            end
+            super
+        end
+    end
 end

data/lib/internethakai/scenario_builder.rb

@@ -33,6 +33,10 @@ module InternetHakai
         def prepare_config
             baseconfig = @config
             basehost, baseport, = Util::parse_url(baseconfig['domain'])
+            if baseconfig['domain'].index('https://')==0
+                baseconfig['ssl'] = true
+                baseport = 443
+            end
             basehostaddress = IPSocket::getaddress(basehost)
             baseconfig['host'] = basehostaddress
             baseconfig['host_name'] = basehost unless baseconfig['host_name']
@@ -130,7 +134,7 @@ module InternetHakai
             @config['hosts'] = hosts
             #concurrency はデフォルトでスレッドと同じ
             if !@config.has_key?('max_scenario') || @config['max_scenario'] < @config['max_request']
-                @config['max_scenario'] = @config['max_request'] 
+                @config['max_scenario'] = @config['max_request']
             end
             @config['max_scenario'] = 1 if @config['max_scenario'] <= 0
 

data/lib/internethakai.rb

@@ -18,7 +18,7 @@ require 'internethakai/generator'
 
 module InternetHakai
     # インターネット破壊
-    VERSION = '0.2.4'
+    VERSION = '0.2.5'
     GET="GET"
     POST="POST"
     PUT="PUT"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - takada-at
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 +09:00
+date: 2012-04-12 00:00:00 +09:00
 default_executable: internethakai
 dependencies: 
 - !ruby/object:Gem::Dependency