From bd3ed0b04f826b20cce83f9b77fc13c0eefd3902 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Wed, 18 Aug 2010 23:59:21 -0700
Subject: add Rainbows::ThreadTimeout middleware

This allows for per-dispatch timeouts similar to (but not exactly)
the way Mongrel (1.1.x) implemented them with threads.
---
 t/t9100-thread-timeout.sh           | 36 +++++++++++++++++++++
 t/t9100.ru                          |  9 ++++++
 t/t9101-thread-timeout-threshold.sh | 62 +++++++++++++++++++++++++++++++++++++
 t/t9101.ru                          |  9 ++++++
 4 files changed, 116 insertions(+)
 create mode 100755 t/t9100-thread-timeout.sh
 create mode 100644 t/t9100.ru
 create mode 100755 t/t9101-thread-timeout-threshold.sh
 create mode 100644 t/t9101.ru

(limited to 't')

diff --git a/t/t9100-thread-timeout.sh b/t/t9100-thread-timeout.sh
new file mode 100755
index 0000000..ab46e5a
--- /dev/null
+++ b/t/t9100-thread-timeout.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+. ./test-lib.sh
+case $model in
+ThreadSpawn|ThreadPool|RevThreadSpawn|RevThreadPool) ;;
+*) t_info "$0 is only compatible with Thread*"; exit 0 ;;
+esac
+
+t_plan 5 "ThreadTimeout Rack middleware test for $model"
+
+t_begin "configure and start" && {
+	rtmpfiles curl_err
+	rainbows_setup
+	rainbows -D t9100.ru -c $unicorn_config
+	rainbows_wait_start
+}
+
+t_begin "normal request should not timeout" && {
+	test x"HI" = x"$(curl -sSf http://$listen/ 2>> $curl_err)"
+}
+
+t_begin "sleepy request times out with 408" && {
+	rm -f $ok
+	curl -sSf http://$listen/2 2>> $curl_err || > $ok
+	test -e $ok
+	grep 408 $curl_err
+}
+
+t_begin "kill server" && {
+	kill $rainbows_pid
+}
+
+t_begin "no errors in Rainbows! stderr" && {
+	check_stderr
+}
+
+t_done
diff --git a/t/t9100.ru b/t/t9100.ru
new file mode 100644
index 0000000..ed9e1ee
--- /dev/null
+++ b/t/t9100.ru
@@ -0,0 +1,9 @@
+use Rack::ContentLength
+use Rack::ContentType, 'text/plain'
+use Rainbows::ThreadTimeout, :timeout => 1
+run lambda { |env|
+  if env["PATH_INFO"] =~ %r{/([\d\.]+)\z}
+    Rainbows.sleep($1.to_f)
+  end
+  [ 200, [], [ "HI\n" ] ]
+}
diff --git a/t/t9101-thread-timeout-threshold.sh b/t/t9101-thread-timeout-threshold.sh
new file mode 100755
index 0000000..1979dba
--- /dev/null
+++ b/t/t9101-thread-timeout-threshold.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+. ./test-lib.sh
+case $model in
+ThreadSpawn|ThreadPool|RevThreadSpawn|RevThreadPool) ;;
+*) t_info "$0 is only compatible with Thread*"; exit 0 ;;
+esac
+
+t_plan 6 "ThreadTimeout Rack middleware test for $model"
+
+t_begin "configure and start" && {
+	rtmpfiles curl_err curl_out
+	rainbows_setup $model 10
+	rainbows -D t9101.ru -c $unicorn_config
+	rainbows_wait_start
+}
+
+t_begin "normal request should not timeout" && {
+	test x"HI" = x"$(curl -sSf http://$listen/ 2>> $curl_err)"
+}
+
+t_begin "8 sleepy requests do not time out" && {
+	> $curl_err
+	for i in 1 2 3 4 5 6 7 8
+	do
+		curl --no-buffer -sSf http://$listen/3 \
+		  2>> $curl_err >> $curl_out &
+	done
+	wait
+	test 8 -eq "$(wc -l < $curl_out)"
+	test xHI = x"$(sort < $curl_out | uniq)"
+}
+
+t_begin "9 sleepy requests do time out" && {
+	> $curl_err
+	> $curl_out
+	for i in 1 2 3 4 5 6 7 8 9
+	do
+		rtmpfiles curl_err_$i
+		curl -sSf --no-buffer \
+		  http://$listen/3 2>> ${curl_err}_${i} >> $curl_out &
+	done
+	wait
+	if test -s $curl_out
+	then
+		dbgcat curl_out
+		die "$curl_out should be empty"
+	fi
+	for i in 1 2 3 4 5 6 7 8 9
+	do
+		grep 408 ${curl_err}_${i}
+	done
+}
+
+t_begin "kill server" && {
+	kill $rainbows_pid
+}
+
+t_begin "no errors in Rainbows! stderr" && {
+	check_stderr
+}
+
+t_done
diff --git a/t/t9101.ru b/t/t9101.ru
new file mode 100644
index 0000000..ee20085
--- /dev/null
+++ b/t/t9101.ru
@@ -0,0 +1,9 @@
+use Rack::ContentLength
+use Rack::ContentType, 'text/plain'
+use Rainbows::ThreadTimeout, :timeout => 1, :threshold => -1
+run lambda { |env|
+  if env["PATH_INFO"] =~ %r{/([\d\.]+)\z}
+    Rainbows.sleep($1.to_f)
+  end
+  [ 200, [], [ "HI\n" ] ]
+}
-- 
cgit v1.2.3-24-ge0c7