0
@@ -2,7 +2,7 @@
0
 # > copyrite 2008 chris wanstrath
0
 # < chris[at]ozmm[dot]org
0
 # > MIT License 
0
-%w( rubygems open-uri erb timeout sinatra sequel mofo open3 ).each { |f| require f }
0
+%w( rubygems open-uri erb timeout sinatra sequel mofo open3 open4 ).each { |f| require f }
0
 gem 'mofo', '>= 0.2.11'
0
 Mofo.timeout = 10
0
 
0
@@ -19,6 +19,16 @@ rescue Timeout::Error
0
   nil
0
 end
0
 
0
+def timeout_exec(command)
0
+  pid = nil
0
+  Timeout.timeout(5) do
0
+    pid, _, stdout, _ = Open4.popen4(*command.split(' '))
0
+    stdout.read
0
+  end
0
+rescue Timeout::Error
0
+  Process.kill('HUP', pid)
0
+end
0
+
0
 ##
0
 # DB stuff
0
 DB = Sequel('sqlite:/db/subtle.db')
0
@@ -41,7 +51,8 @@ class Item < Sequel::Model
0
   end
0
 
0
   def self.is_svn?(url)
0
-    timeout { `/usr/bin/env svn info #{url}` =~ /Path:/ }
0
+    info = timeout_exec "/usr/bin/env svn info #{url}" 
0
+    info =~ /Path:/
0
   end
0
 
0
   def self.find_or_create_by_url(url)
0
@@ -139,22 +150,32 @@ def render_svn_feed(item)
0
   xslt_file = "/tmp/tmp-#{item.key}.xslt"
0
   erb_file  = "#{File.expand_path(File.dirname(__FILE__))}/templates/svnlog.erb"
0
 
0
+  cleanup = proc { rm tmp_file, xslt_file }
0
+
0
   File.open(xslt_file, 'w') do |file|
0
     file.puts ERB.new(File.read(erb_file)).result(binding)
0
   end
0
 
0
   File.open(tmp_file, 'w') do |f|
0
-    timeout { f.puts `/usr/bin/env svn log #{item.url.gsub(/ |\\|;/,'')} --limit 15 -v --xml` }
0
+    value = timeout_exec "/usr/bin/env svn log #{item.url.gsub(/ |\\|;/,'')} --limit 15 -v --xml"
0
+    return cleanup[] if value.nil?
0
+    f.puts value
0
   end
0
 
0
   File.open(@file, 'w') do |f|
0
-    timeout { f.puts `/usr/bin/env xsltproc #{xslt_file} #{tmp_file}` }
0
+    value = timeout_exec "/usr/bin/env xsltproc #{xslt_file} #{tmp_file}"
0
+    return cleanup[] if value.nil?
0
+    f.puts value
0
   end
0
 
0
-  `rm #{tmp_file} #{xslt_file}`
0
+  cleanup[]
0
   sendfile @file
0
 end
0
 
0
+def rm(*files)
0
+  `rm #{files.join(' ')}`
0
+end
0
+
0
 def render_atom_feed(item)
0
   website = timeout { open(item.url).read }
0
   title   = Hpricot(website).at(:title).innerHTML