puma 2.1.1 → 7.2.1

data/test/test_thread_pool.rb

@@ -1,146 +0,0 @@
-require 'test/unit'
-
-require 'puma/thread_pool'
-
-class TestThreadPool < Test::Unit::TestCase
-
-  def teardown
-    @pool.shutdown if @pool
-  end
-
-  def new_pool(min, max, &blk)
-    blk = proc { } unless blk
-    @pool = Puma::ThreadPool.new(min, max, &blk)
-  end
-
-  def pause
-    sleep 0.2
-  end
-
-  def test_append_spawns
-    saw = []
-
-    pool = new_pool(0, 1) do |work|
-      saw << work
-    end
-
-    pool << 1
-
-    pause
-
-    assert_equal [1], saw
-    assert_equal 1, pool.spawned
-  end
-
-  def test_append_queues_on_max
-    finish = false
-    pool = new_pool(0, 1) { Thread.pass until finish }
-
-    pool << 1
-    pool << 2
-    pool << 3
-
-    pause
-
-    assert_equal 2, pool.backlog
-
-    finish = true
-  end
-
-  def test_trim
-    pool = new_pool(0, 1)
-
-    pool << 1
-
-    pause
-
-    assert_equal 1, pool.spawned
-    pool.trim
-
-    pause
-    assert_equal 0, pool.spawned
-  end
-
-  def test_trim_leaves_min
-    finish = false
-    pool = new_pool(1, 2) { Thread.pass until finish }
-
-    pool << 1
-    pool << 2
-
-    finish = true
-
-    pause
-
-    assert_equal 2, pool.spawned
-    pool.trim
-    pause
-
-    assert_equal 1, pool.spawned
-    pool.trim
-    pause
-
-    assert_equal 1, pool.spawned
-
-  end
-
-  def test_force_trim_doesnt_overtrim
-    finish = false
-    pool = new_pool(1, 2) { Thread.pass until finish }
-
-    pool << 1
-    pool << 2
-
-    assert_equal 2, pool.spawned
-    pool.trim true
-    pool.trim true
-
-    finish = true
-
-    pause
-
-    assert_equal 1, pool.spawned
-  end
-
-  def test_trim_is_ignored_if_no_waiting_threads
-    finish = false
-    pool = new_pool(1, 2) { Thread.pass until finish }
-
-    pool << 1
-    pool << 2
-
-    assert_equal 2, pool.spawned
-    pool.trim
-    pool.trim
-
-    assert_equal 0, pool.trim_requested
-
-    finish = true
-
-    pause
-  end
-
-  def test_autotrim
-    finish = false
-    pool = new_pool(1, 2) { Thread.pass until finish }
-
-    pool << 1
-    pool << 2
-
-    assert_equal 2, pool.spawned
-
-    finish = true
-
-    pause
-
-    assert_equal 2, pool.spawned
-
-    pool.auto_trim! 1
-
-    sleep 1
-
-    pause
-
-    assert_equal 1, pool.spawned
-  end
-end

data/test/test_unix_socket.rb

@@ -1,39 +0,0 @@
-require "rbconfig"
-require 'test/unit'
-require 'puma/server'
-
-require 'socket'
-
-# UNIX sockets are not recommended on JRuby
-# (or Windows)
-unless defined?(JRUBY_VERSION) || RbConfig::CONFIG["host_os"] =~ /mingw|mswin/
-  class TestPumaUnixSocket < Test::Unit::TestCase
-  
-    App = lambda { |env| [200, {}, ["Works"]] }
-  
-    Path = "test/puma.sock"
-  
-    def setup
-      @server = Puma::Server.new App
-      @server.add_unix_listener Path
-      @server.run
-    end
-  
-    def teardown
-      @server.stop(true)
-      File.unlink Path if File.exists? Path
-    end
-  
-    def test_server
-      sock = UNIXSocket.new Path
-  
-      sock << "GET / HTTP/1.0\r\nHost: blah.com\r\n\r\n"
-  
-      expected = "HTTP/1.0 200 OK\r\nConnection: close\r\nContent-Length: 5\r\n\r\nWorks"
-  
-      assert_equal expected, sock.read(expected.size)
-  
-      sock.close
-    end
-  end
-end

data/test/test_ws.rb

@@ -1,89 +0,0 @@
-# Copyright (c) 2011 Evan Phoenix
-# Copyright (c) 2005 Zed A. Shaw 
-
-require 'test/testhelp'
-
-include Puma
-
-class TestHandler
-  attr_reader :ran_test
-
-  def call(env)
-    @ran_test = true
-
-    [200, {"Content-Type" => "text/plain"}, ["hello!"]]
-  end
-end
-
-class WebServerTest < Test::Unit::TestCase
-
-  def setup
-    @valid_request = "GET / HTTP/1.1\r\nHost: www.zedshaw.com\r\nContent-Type: text/plain\r\n\r\n"
-    
-    @tester = TestHandler.new
-
-    @server = Server.new @tester, Events.strings
-    @server.add_tcp_listener "127.0.0.1", 9998
-
-    @server.run
-  end
-
-  def teardown
-    @server.stop(true)
-  end
-
-  def test_simple_server
-    hit(['http://127.0.0.1:9998/test'])
-    assert @tester.ran_test, "Handler didn't really run"
-  end
-
-
-  def do_test(string, chunk, close_after=nil, shutdown_delay=0)
-    # Do not use instance variables here, because it needs to be thread safe
-    socket = TCPSocket.new("127.0.0.1", 9998);
-    request = StringIO.new(string)
-    chunks_out = 0
-
-    while data = request.read(chunk)
-      chunks_out += socket.write(data)
-      socket.flush
-      sleep 0.2
-      if close_after and chunks_out > close_after
-        socket.close
-        sleep 1
-      end
-    end
-    sleep(shutdown_delay)
-    socket.write(" ") # Some platforms only raise the exception on attempted write
-    socket.flush
-  end
-
-  def test_trickle_attack
-    do_test(@valid_request, 3)
-  end
-
-  def test_close_client
-    assert_raises IOError do
-      do_test(@valid_request, 10, 20)
-    end
-  end
-
-  def test_bad_client
-    do_test("GET /test HTTP/BAD", 3)
-  end
-
-  def test_header_is_too_long
-    long = "GET /test HTTP/1.1\r\n" + ("X-Big: stuff\r\n" * 15000) + "\r\n"
-    assert_raises Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNABORTED, Errno::EINVAL, IOError do
-      do_test(long, long.length/2, 10)
-    end
-  end
-
-  def test_file_streamed_request
-    body = "a" * (Puma::Const::MAX_BODY * 2)
-    long = "GET /test HTTP/1.1\r\nContent-length: #{body.length}\r\n\r\n" + body
-    do_test(long, (Puma::Const::CHUNK_SIZE * 2) - 400)
-  end
-
-end
-

data/tools/jungle/init.d/README.md

@@ -1,54 +0,0 @@
-# Puma daemon service
-
-Init script to manage multiple Puma servers on the same box using start-stop-daemon.
-
-## Installation 
-
-    # Copy the init script to services directory 
-    sudo cp puma /etc/init.d
-    sudo chmod +x /etc/init.d/puma
-    
-    # Make it start at boot time. 
-    sudo update-rc.d -f puma defaults
-
-    # Copy the Puma runner to an accessible location
-    sudo cp run-puma /usr/local/bin
-    sudo chmod +x /usr/local/bin/run-puma
-
-    # Create an empty configuration file
-    sudo touch /etc/puma.conf
-
-## Managing the jungle 
-
-Puma apps are held in /etc/puma.conf by default. It's mainly a CSV file and every line represents one app. Here's the syntax:
-
-    app-path,user,config-file-path,log-file-path
-
-You can add an instance by editing the file or running the following command:
-
-    sudo /etc/init.d/puma add /path/to/app user /path/to/app/config/puma.rb /path/to/app/config/log/puma.log
-
-The config and log paths are optional parameters and default to:
-
-* config: /path/to/app/*config/puma.rb*
-* log: /path/to/app/*config/puma.log*
-
-To remove an app, simply delete the line from the config file or run:
-
-    sudo /etc/init.d/puma remove /path/to/app
-
-The command will make sure the Puma instance stops before removing it from the jungle.
-
-## Assumptions 
-
-* The script expects a temporary folder named /path/to/app/*tmp/puma* to exist. Create it if it's not there by default.
-The pid and state files should live there and must be called: *tmp/puma/pid* and *tmp/puma/state*.
-You can change those if you want but you'll have to adapt the script for it to work.
-
-* Here's what a minimal app's config file should have:
-
-```
-pidfile "/path/to/app/tmp/puma/pid"
-state_path "/path/to/app/tmp/puma/state"
-activate_control_app
-```

data/tools/jungle/init.d/puma

@@ -1,332 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          puma 
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Example initscript
-# Description:       This file should be used to construct scripts to be
-#                    placed in /etc/init.d.
-### END INIT INFO
-
-# Author: Darío Javier Cravero <dario@exordo.com>
-#
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/usr/local/bin:/usr/local/sbin/:/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Puma rack web server"
-NAME=puma
-DAEMON=$NAME
-SCRIPTNAME=/etc/init.d/$NAME
-CONFIG=/etc/puma.conf
-JUNGLE=`cat $CONFIG`
-RUNPUMA=/usr/local/bin/run-puma
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the jungle 
-#
-do_start() {
-  log_daemon_msg "=> Running the jungle..."
-  for i in $JUNGLE; do
-    dir=`echo $i | cut -d , -f 1`
-    user=`echo $i | cut -d , -f 2`
-    config_file=`echo $i | cut -d , -f 3`
-    if [ "$config_file" = "" ]; then
-      config_file="$dir/config/puma.rb"
-    fi
-    log_file=`echo $i | cut -d , -f 4`
-    if [ "$log_file" = "" ]; then
-      log_file="$dir/log/puma.log"
-    fi
-    do_start_one $dir $user $config_file $log_file
-  done
-}
-
-do_start_one() {
-  PIDFILE=$1/tmp/puma/pid
-  if [ -e $PIDFILE ]; then
-    PID=`cat $PIDFILE`
-    # If the puma isn't running, run it, otherwise restart it.
-    if [ "`ps -A -o pid= | grep -c $PID`" -eq 0 ]; then
-      do_start_one_do $1 $2 $3 $4
-    else
-      do_restart_one $1
-    fi
-  else
-    do_start_one_do $1 $2 $3 $4
-  fi
-}
-
-do_start_one_do() {
-  log_daemon_msg "--> Woke up puma $1"
-  log_daemon_msg "user $2"
-  log_daemon_msg "log to $4"
-  start-stop-daemon --verbose --start --chdir $1 --chuid $2 --background --exec $RUNPUMA -- $1 $3 $4
-}
-
-#
-# Function that stops the jungle
-#
-do_stop() {
-  log_daemon_msg "=> Putting all the beasts to bed..."
-  for i in $JUNGLE; do
-    dir=`echo $i | cut -d , -f 1`
-    do_stop_one $dir
-  done
-}
-#
-# Function that stops the daemon/service
-#
-do_stop_one() {
-  log_daemon_msg "--> Stopping $1"
-  PIDFILE=$1/tmp/puma/pid
-  STATEFILE=$1/tmp/puma/state
-  if [ -e $PIDFILE ]; then
-    PID=`cat $PIDFILE`
-    if [ "`ps -A -o pid= | grep -c $PID`" -eq 0 ]; then
-      log_daemon_msg "---> Puma $1 isn't running."
-    else
-      log_daemon_msg "---> About to kill PID `cat $PIDFILE`"
-      pumactl --state $STATEFILE stop
-      # Many daemons don't delete their pidfiles when they exit.
-      rm -f $PIDFILE $STATEFILE
-    fi
-  else
-    log_daemon_msg "---> No puma here..."
-  fi
-  return 0
-}
-
-#
-# Function that restarts the jungle 
-#
-do_restart() {
-  for i in $JUNGLE; do
-    dir=`echo $i | cut -d , -f 1`
-    do_restart_one $dir
-  done
-}
-
-#
-# Function that sends a SIGUSR2 to the daemon/service
-#
-do_restart_one() {
-  PIDFILE=$1/tmp/puma/pid
-  i=`grep $1 $CONFIG`
-  dir=`echo $i | cut -d , -f 1`
-  
-  if [ -e $PIDFILE ]; then
-    log_daemon_msg "--> About to restart puma $1"
-    pumactl --state $dir/tmp/puma/state restart
-    # kill -s USR2 `cat $PIDFILE`
-    # TODO Check if process exist
-  else
-    log_daemon_msg "--> Your puma was never playing... Let's get it out there first" 
-    user=`echo $i | cut -d , -f 2`
-    config_file=`echo $i | cut -d , -f 3`
-    if [ "$config_file" = "" ]; then
-      config_file="$dir/config/puma.rb"
-    fi
-    log_file=`echo $i | cut -d , -f 4`
-    if [ "$log_file" = "" ]; then
-      log_file="$dir/log/puma.log"
-    fi
-    do_start_one $dir $user $config_file $log_file
-  fi
-	return 0
-}
-
-#
-# Function that statuss the jungle 
-#
-do_status() {
-  for i in $JUNGLE; do
-    dir=`echo $i | cut -d , -f 1`
-    do_status_one $dir
-  done
-}
-
-#
-# Function that sends a SIGUSR2 to the daemon/service
-#
-do_status_one() {
-  PIDFILE=$1/tmp/puma/pid
-  i=`grep $1 $CONFIG`
-  dir=`echo $i | cut -d , -f 1`
-  
-  if [ -e $PIDFILE ]; then
-    log_daemon_msg "--> About to status puma $1"
-    pumactl --state $dir/tmp/puma/state stats
-    # kill -s USR2 `cat $PIDFILE`
-    # TODO Check if process exist
-  else
-    log_daemon_msg "--> $1 isn't there :(..." 
-  fi
-	return 0
-}
-
-do_add() {
-  str=""
-  # App's directory
-  if [ -d "$1" ]; then
-    if [ "`grep -c "^$1" $CONFIG`" -eq 0 ]; then
-      str=$1
-    else
-      echo "The app is already being managed. Remove it if you want to update its config."
-      exit 1 
-    fi
-  else
-    echo "The directory $1 doesn't exist."
-    exit 1
-  fi
-  # User to run it as
-  if [ "`grep -c "^$2:" /etc/passwd`" -eq 0 ]; then
-    echo "The user $2 doesn't exist."
-    exit 1
-  else
-    str="$str,$2"
-  fi
-  # Config file
-  if [ "$3" != "" ]; then
-    if [ -e $3 ]; then
-      str="$str,$3"
-    else
-      echo "The config file $3 doesn't exist."
-      exit 1
-    fi
-  fi
-  # Log file
-  if [ "$4" != "" ]; then
-    str="$str,$4"
-  fi
-
-  # Add it to the jungle 
-  echo $str >> $CONFIG
-  log_daemon_msg "Added a Puma to the jungle: $str. You still have to start it though."
-}
-
-do_remove() {
-  if [ "`grep -c "^$1" $CONFIG`" -eq 0 ]; then
-    echo "There's no app $1 to remove."
-  else
-    # Stop it first.
-    do_stop_one $1
-    # Remove it from the config.
-    sed -i "\\:^$1:d" $CONFIG
-    log_daemon_msg "Removed a Puma from the jungle: $1."
-  fi
-}
-
-case "$1" in
-  start)
-    [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-    if [ "$#" -eq 1 ]; then
-      do_start
-    else
-      i=`grep $2 $CONFIG`
-      dir=`echo $i | cut -d , -f 1`
-      user=`echo $i | cut -d , -f 2`
-      config_file=`echo $i | cut -d , -f 3`
-      if [ "$config_file" = "" ]; then
-        config_file="$dir/config/puma.rb"
-      fi
-      log_file=`echo $i | cut -d , -f 4`
-      if [ "$log_file" = "" ]; then
-        log_file="$dir/log/puma.log"
-      fi
-      do_start_one $dir $user $config_file $log_file
-    fi
-    case "$?" in
-      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-    esac
-  ;;
-  stop)
-    [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-    if [ "$#" -eq 1 ]; then
-      do_stop
-    else
-      i=`grep $2 $CONFIG`
-      dir=`echo $i | cut -d , -f 1`
-      do_stop_one $dir
-    fi
-    case "$?" in
-      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-    esac
-  ;;
-  status)
-    # TODO Implement.
-    log_daemon_msg "Status $DESC" "$NAME"
-    if [ "$#" -eq 1 ]; then
-      do_status
-    else
-      i=`grep $2 $CONFIG`
-      dir=`echo $i | cut -d , -f 1`
-      do_status_one $dir
-    fi
-    case "$?" in
-      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-    esac
-  ;;
-  restart)
-    log_daemon_msg "Restarting $DESC" "$NAME"
-    if [ "$#" -eq 1 ]; then
-      do_restart
-    else
-      i=`grep $2 $CONFIG`
-      dir=`echo $i | cut -d , -f 1`
-      do_restart_one $dir
-    fi
-    case "$?" in
-      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-    esac
-  ;;
-  add)
-    if [ "$#" -lt 3 ]; then
-      echo "Please, specifiy the app's directory and the user that will run it at least."
-      echo "  Usage: $SCRIPTNAME add /path/to/app user /path/to/app/config/puma.rb /path/to/app/config/log/puma.log"
-      echo "    config and log are optionals."
-      exit 1
-    else
-      do_add $2 $3 $4 $5
-    fi
-    case "$?" in
-      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-    esac
-  ;;
-  remove)
-    if [ "$#" -lt 2 ]; then
-      echo "Please, specifiy the app's directory to remove."
-      exit 1
-    else
-      do_remove $2
-    fi
-    case "$?" in
-      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-    esac
-  ;;
-  *)
-    echo "Usage:" >&2
-    echo "  Run the jungle: $SCRIPTNAME {start|stop|status|restart}" >&2
-    echo "  Add a Puma: $SCRIPTNAME add /path/to/app user /path/to/app/config/puma.rb /path/to/app/config/log/puma.log"
-    echo "    config and log are optionals."
-    echo "  Remove a Puma: $SCRIPTNAME remove /path/to/app"
-    echo "  On a Puma: $SCRIPTNAME {start|stop|status|restart} PUMA-NAME" >&2
-    exit 3
-  ;;
-esac
-:

data/tools/jungle/init.d/run-puma

@@ -1,3 +0,0 @@
-#!/bin/bash
-app=$1; config=$2; log=$3;
-cd $app && exec bundle exec puma -C $config 2>&1 >> $log