about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2010-03-01 09:32:36 +0000
committerEric Wong <normalperson@yhbt.net>2010-03-01 18:26:31 +0000
commitb1e90244af775cc6713a531f4194726e35df5379 (patch)
treef53748a3c46600bdd6355fa95451ed757642e040
parent39bdcadb986e3ca82a243ace90daee28c9d3f1e4 (diff)
A bunch of small fixes related to startup/configuration and hot
reload issues with HUP:

* Variables in the user-generated config.ru files no longer
  risk clobbering variables used in laucher scripts.

* signal handlers are initialized before the pid file is
  dropped, so over-eager firing of init scripts won't
  mysteriously nuke a process.

* SIGHUP will return app to original state if an updated
  config.ru fails to load due to {Syntax,Load}Error.

* unicorn_rails should be Rails 3 compatible out-of-the-box
  ('unicorn' works as always, and is recommended for Rails 3)

* unicorn_rails is finally "working_directory"-aware when
  generating default temporary paths and pid file

* config.ru encoding is the application's default in 1.9,
  not forced to binary like many parts of Unicorn.

* configurator learned to handle the "user" directive outside
  of after_fork hook (which will always remain supported).

There are also various internal cleanups and possible speedups.
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--GNUmakefile2
-rw-r--r--lib/unicorn/const.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index ccb2fe3..1e6f505 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.96.0.GIT
+DEF_VER=v0.97.0.GIT
 
 LF='
 '
diff --git a/GNUmakefile b/GNUmakefile
index 70707ce..5c5b030 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -160,7 +160,7 @@ NEWS: GIT-VERSION-FILE .manifest
         $(RAKE) -s news_rdoc > $@+
         mv $@+ $@
 
-SINCE = 0.95.0
+SINCE = 0.96.0
 ChangeLog: LOG_VERSION = \
   $(shell git rev-parse -q "$(GIT_VERSION)" >/dev/null 2>&1 && \
           echo $(GIT_VERSION) || git describe)
diff --git a/lib/unicorn/const.rb b/lib/unicorn/const.rb
index e2256e7..647a038 100644
--- a/lib/unicorn/const.rb
+++ b/lib/unicorn/const.rb
@@ -7,7 +7,7 @@ module Unicorn
   # gave about a 3% to 10% performance improvement over using the strings directly.
   # Symbols did not really improve things much compared to constants.
   module Const
-    UNICORN_VERSION="0.97.0pre"
+    UNICORN_VERSION="0.97.0"
 
     DEFAULT_HOST = "0.0.0.0" # default TCP listen host address
     DEFAULT_PORT = 8080      # default TCP listen port