passenger 4.0.17 → 4.0.18

data/ext/oxt/detail/context.hpp

@@ -82,6 +82,7 @@ struct thread_local_context {
 };
 
 
+void set_thread_local_context(const thread_local_context_ptr &ctx);
 thread_local_context *get_thread_local_context();
 
 

data/ext/oxt/implementation.cpp

@@ -64,7 +64,7 @@ static global_context_t *global_context = NULL;
 		/* Do nothing. */
 	}
 	
-	static void
+	void
 	set_thread_local_context(const thread_local_context_ptr &ctx) {
 		local_context = new thread_local_context_ptr(ctx);
 	}
@@ -99,7 +99,7 @@ static global_context_t *global_context = NULL;
 		local_context = new thread_specific_ptr<thread_local_context_ptr>();
 	}
 
-	static void
+	void
 	set_thread_local_context(const thread_local_context_ptr &ctx) {
 		if (local_context != NULL) {
 			local_context->reset(new thread_local_context_ptr(ctx));
@@ -131,9 +131,11 @@ static global_context_t *global_context = NULL;
 
 #ifdef OXT_BACKTRACE_IS_ENABLED
 
-trace_point::trace_point(const char *_function, const char *_source, unsigned int _line)
+trace_point::trace_point(const char *_function, const char *_source, unsigned short _line,
+	const char *_data)
 	: function(_function),
 	  source(_source),
+	  data(_data),
 	  line(_line),
 	  m_detached(false)
 {
@@ -146,9 +148,11 @@ trace_point::trace_point(const char *_function, const char *_source, unsigned in
 	}
 }
 
-trace_point::trace_point(const char *_function, const char *_source, unsigned int _line, bool detached)
+trace_point::trace_point(const char *_function, const char *_source, unsigned short _line,
+	const char *_data, const detached &detached_tag)
 	: function(_function),
 	  source(_source),
+	  data(_data),
 	  line(_line),
 	  m_detached(true)
 { }
@@ -165,7 +169,7 @@ trace_point::~trace_point() {
 }
 
 void
-trace_point::update(const char *source, unsigned int line) {
+trace_point::update(const char *source, unsigned short line) {
 	this->source = source;
 	this->line = line;
 }
@@ -183,7 +187,8 @@ tracable_exception::tracable_exception() {
 				(*it)->function,
 				(*it)->source,
 				(*it)->line,
-				true);
+				(*it)->data,
+				trace_point::detached());
 			backtrace_copy.push_back(p);
 		}
 	}
@@ -199,7 +204,8 @@ tracable_exception::tracable_exception(const tracable_exception &other)
 			(*it)->function,
 			(*it)->source,
 			(*it)->line,
-			true);
+			(*it)->data,
+			trace_point::detached());
 		backtrace_copy.push_back(p);
 	}
 }
@@ -239,6 +245,9 @@ format_backtrace(const Collection &backtrace_list) {
 					source = p->source;
 				}
 				result << " (" << source << ":" << p->line << ")";
+				if (p->data != NULL) {
+					result << " -- " << p->data;
+				}
 			}
 			result << endl;
 		}
@@ -268,6 +277,11 @@ void initialize() {
 	ctx->thread_number = 1;
 	ctx->thread_name = "Main thread";
 	set_thread_local_context(ctx);
+
+	ctx->thread = pthread_self();
+	global_context->registered_threads.push_back(ctx);
+	ctx->iterator = global_context->registered_threads.end();
+	ctx->iterator--;
 }
 
 

data/helper-scripts/download_binaries/extconf.rb

@@ -35,7 +35,7 @@ end
 
 # Don't do anything on Windows. We don't support Windows but exiting now
 # will at least prevent the gem from being not installable on Windows.
-exit if RUBY_PLATFORM =~ /mswin/i || RUBY_PLATFORM =~ /win32/i
+exit if RUBY_PLATFORM =~ /mswin/i || RUBY_PLATFORM =~ /win32/i || RUBY_PLATFORM =~ /mingw/
 
 source_root = File.expand_path("../..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 	
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.17'
+	VERSION_STRING = '4.0.18'
 	
 	PREFERRED_NGINX_VERSION = '1.4.2'
 	NGINX_SHA256_CHECKSUM = '5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611'

data/lib/phusion_passenger/analytics_logger.rb

@@ -125,7 +125,7 @@ class AnalyticsLogger
 			@connection.synchronize do
 				return if !@connection.connected?
 				begin
-					# We need an ACK here. See abstract_request_handler.rb finalize_request.
+					# We need an ACK here. See thread_handler.rb finalize_request.
 					@connection.channel.write("closeTransaction", @txn_id,
 						AnalyticsLogger.timestamp_string, true)
 					result = @connection.channel.read
@@ -228,7 +228,7 @@ class AnalyticsLogger
 		end
 	end
 	
-	def new_transaction(group_name, category = :requests, union_station_key = nil)
+	def new_transaction(group_name, category = :requests, union_station_key = "-")
 		if !@server_address
 			return Log.new
 		elsif !group_name || group_name.empty?
@@ -287,7 +287,7 @@ class AnalyticsLogger
 		end
 	end
 	
-	def continue_transaction(txn_id, group_name, category = :requests, union_station_key = nil)
+	def continue_transaction(txn_id, group_name, category = :requests, union_station_key = "-")
 		if !@server_address
 			return Log.new
 		elsif !txn_id || txn_id.empty?

data/lib/phusion_passenger/constants.rb

@@ -42,6 +42,8 @@ module PhusionPassenger
 		DEFAULT_START_TIMEOUT = 90_000
 		DEFAULT_MAX_INSTANCES_PER_APP = 0
 		DEFAULT_WEB_APP_USER = "nobody"
+		DEFAULT_CONCURRENCY_MODEL = "process"
+		DEFAULT_THREAD_COUNT = 1
 		DEFAULT_ANALYTICS_LOG_USER = DEFAULT_WEB_APP_USER
 		DEFAULT_ANALYTICS_LOG_GROUP = ""
 		DEFAULT_ANALYTICS_LOG_PERMISSIONS = "u=rwx,g=rx,o=rx"

data/lib/phusion_passenger/packaging.rb

@@ -50,6 +50,17 @@ module Packaging
 		'passenger-status',
 		'passenger-memory-stats'
 	]
+
+	# Used during native packaging. Specifies executables for
+	# which the shebang should NOT be set to #!/usr/bin/ruby,
+	# so that these executables can be run with any Ruby interpreter
+	# the user desires.
+	EXECUTABLES_WITH_FREE_RUBY = [
+		'passenger',
+		'passenger-config',
+		'passenger-install-apache2-module',
+		'passenger-install-nginx-module'
+	]
 	
 	# A list of globs which match all files that should be packaged
 	# in the Phusion Passenger gem or tarball.
@@ -119,6 +130,11 @@ module Packaging
 		"debian.template/**/*",
 	]
 
+	# Files and directories that should be excluded from the Homebrew installation.
+	HOMEBREW_EXCLUDE = [
+		"dev", "test", ".gitignore", ".travis.yml", "debian.template", "rpm"
+	]
+
 	def self.files
 		return Dir[*GLOB] - Dir[*EXCLUDE_GLOB]
 	end

data/lib/phusion_passenger/standalone/command.rb

@@ -36,6 +36,8 @@ class Command
 		:max_pool_size => 6,
 		:min_instances => 1,
 		:spawn_method  => Kernel.respond_to?(:fork) ? 'smart' : 'direct',
+		:concurrency_model => DEFAULT_CONCURRENCY_MODEL,
+		:thread_count  => DEFAULT_THREAD_COUNT,
 		:nginx_version => PREFERRED_NGINX_VERSION,
 		:friendly_error_pages => true
 	}.freeze
@@ -187,6 +189,7 @@ private
 		@config_filename = "#{@temp_dir}/config"
 		location_config_filename = "#{@temp_dir}/locations.ini"
 		File.chmod(0755, @temp_dir)
+		Dir.mkdir("#{@temp_dir}/logs")
 
 		locations_ini_fields =
 			PhusionPassenger::REQUIRED_LOCATIONS_INI_FIELDS +

data/lib/phusion_passenger/standalone/start_command.rb

@@ -85,10 +85,12 @@ class StartCommand < Command
 			watch_log_files_in_background if should_watch_logs?
 			wait_until_nginx_has_exited if should_wait_until_nginx_has_exited?
 		rescue Interrupt
+			begin_shutdown
 			stop_threads
 			stop_nginx
 			exit 2
 		rescue SignalException => signal
+			begin_shutdown
 			stop_threads
 			stop_nginx
 			if signal.message == 'SIGINT' || signal.message == 'SIGTERM'
@@ -97,12 +99,18 @@ class StartCommand < Command
 				raise
 			end
 		rescue Exception => e
+			begin_shutdown
 			stop_threads
 			stop_nginx
 			raise
 		ensure
-			stop_touching_temp_dir_in_background if should_wait_until_nginx_has_exited?
-			stop_threads
+			begin_shutdown
+			begin
+				stop_touching_temp_dir_in_background if should_wait_until_nginx_has_exited?
+				stop_threads
+			ensure
+				finalize_shutdown
+			end
 		end
 	ensure
 		if @temp_dir
@@ -155,6 +163,14 @@ private
 				wrap_desc("The spawn method to use (default: #{@options[:spawn_method]})")) do |value|
 				@options[:spawn_method] = value
 			end
+			opts.on("--concurrency-model NAME", String,
+				wrap_desc("The concurrency model to use, either 'process' or 'thread' (default: #{@options[:concurrency_model]}) (Enterprise only)")) do |value|
+				@options[:concurrency_model] = value
+			end
+			opts.on("--thread-count NAME", Integer,
+				wrap_desc("The number of threads to use when using the 'thread' concurrency model (default: #{@options[:thread_count]}) (Enterprise only)")) do |value|
+				@options[:thread_count] = value
+			end
 			opts.on("--rolling-restarts",
 				wrap_desc("Enable rolling restarts (Enterprise only)")) do
 				@options[:rolling_restarts] = true
@@ -560,6 +576,28 @@ private
 		@toucher = IO.popen("sh #{script} #{dir}", "r")
 	end
 
+	def begin_shutdown
+		return if @shutting_down
+		@shutting_down = 1
+		trap("INT", &method(:signal_during_shutdown))
+		trap("TERM", &method(:signal_during_shutdown))
+	end
+
+	def finalize_shutdown
+		@shutting_down = nil
+		trap("INT", "DEFAULT")
+		trap("TERM", "DEFAULT")
+	end
+
+	def signal_during_shutdown(signal)
+		if @shutting_down == 1
+			@shutting_down += 1
+			puts "Ignoring signal #{signal} during shutdown. Send it again to force exit."
+		else
+			exit!(1)
+		end
+	end
+
 	def stop_touching_temp_dir_in_background
 		if @toucher
 			begin

data/resources/templates/standalone/config.erb

@@ -47,6 +47,7 @@ http {
     
     default_type application/octet-stream;
     types_hash_max_size 2048;
+    server_names_hash_bucket_size 64;
     client_max_body_size 1024m;
     access_log off;
     keepalive_timeout 60;
@@ -81,6 +82,8 @@ http {
         passenger_enabled on;
         rails_env <%= app[:env] %>;
         passenger_spawn_method <%= app[:spawn_method] %>;
+        <% if app[:concurrency_model] != DEFAULT_CONCURRENCY_MODEL %>passenger_concurrency_model <%= app[:concurrency_model] %>;<% end %>
+        <% if app[:thread_count] != DEFAULT_THREAD_COUNT %>passenger_thread_count <%= app[:thread_count] %>;<% end %>
         <% if app[:min_instances] %>passenger_min_instances <%= app[:min_instances] %>;<% end %>
         <% if app[:union_station_key] %>
             union_station_support on;

data/test/cxx/UnionStationTest.cpp

@@ -340,11 +340,11 @@ namespace tut {
 		
 		client1.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"", "true", "true", NULL);
+			"-", "true", "true", NULL);
 		client1.read(args);
 		client2.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"", "true", NULL);
+			"-", "true", NULL);
 		client2.write("log", TODAY_TXN_ID, "1000", NULL);
 		client2.writeScalar("hello world");
 		client2.write("flush", NULL);
@@ -376,11 +376,11 @@ namespace tut {
 		
 		client1.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"", "false", "true", NULL);
+			"-", "false", "true", NULL);
 		client1.read(args);
 		client2.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"", "false", NULL);
+			"-", "false", NULL);
 		client2.write("flush", NULL);
 		client2.read(args);
 		client2.disconnect();
@@ -403,11 +403,11 @@ namespace tut {
 		
 		client1.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"", "true", "true", NULL);
+			"-", "true", "true", NULL);
 		client1.read(args);
 		client2.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"", "true", NULL);
+			"-", "true", NULL);
 		client2.write("flush", NULL);
 		client2.read(args);
 		
@@ -428,11 +428,11 @@ namespace tut {
 		
 		client1.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"", "false", "true", NULL);
+			"-", "false", "true", NULL);
 		client1.read(args);
 		client2.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"", "false", NULL);
+			"-", "false", NULL);
 		client2.write("flush", NULL);
 		client2.read(args);
 		
@@ -704,7 +704,7 @@ namespace tut {
 		
 		client1.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "remote", "requests", TODAY_TIMESTAMP_STR,
-			"", "true", NULL);
+			"-", "true", NULL);
 		client1.write("closeTransaction", TODAY_TXN_ID, TODAY_TIMESTAMP_STR, NULL);
 		client1.write("flush", NULL);
 		client1.read(args);
@@ -718,7 +718,7 @@ namespace tut {
 		// Test logging of new transaction.
 		SystemTime::forceAll(YESTERDAY);
 		
-		LoggerPtr log = factory->newTransaction("foobar", "requests", "",
+		LoggerPtr log = factory->newTransaction("foobar", "requests", "-",
 			"uri == \"/foo\""
 			"\1"
 			"uri != \"/bar\"");
@@ -727,7 +727,7 @@ namespace tut {
 		log->flushToDiskAfterClose(true);
 		log.reset();
 		
-		log = factory->newTransaction("foobar", "requests", "",
+		log = factory->newTransaction("foobar", "requests", "-",
 			"uri == \"/foo\""
 			"\1"
 			"uri == \"/bar\"");

data/test/ruby/analytics_logger_spec.rb

@@ -28,7 +28,7 @@ describe AnalyticsLogger do
 	end
 	
 	def mock_time(time)
-		AnalyticsLogger.stub!(:current_time).and_return(time)
+		AnalyticsLogger.stub(:current_time).and_return(time)
 	end
 	
 	def start_agent

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.17
+  version: 4.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSLtLBAAoJECrHRaUKISqMyXoH/jA+BtiR4so10B+sZh6P1YVY
-rmjhCHnigmgM22lYr/Pa37XosOXx/gNF2SRbseVxTCq47JhYjklx5xVV/PAyYkDn
-KZUf6ahrqhn9UGjQHaDCefqchldEklibj+CP/3VzCpNafK0q9r9MMCioNWj5oYbZ
-RxW6HIJ3DNdbrPi9S3TelkxtOGBnNGJhHC6LfDjFMWo5Wufe0ESF5S6JzPjfBoiN
-F32GGnkfSJXN8ZrCb9yAtw7LHCFCwZNJEgBs2HEntO69R2RzRSOyPGlEAWAIggmz
-Zr8qsANTZhPUmiTq3OVj9ezmz4gWzuwJWar9qwyKxAUjvf95w6CzJyl9r1wm8Vk=
-=+Cn0
+iQEcBAABAgAGBQJSOKPwAAoJECrHRaUKISqMlkcIAIyquE2ypVcCq8Kds8gncXoI
+T94rU5e49Jxqfzd8jxz0CDihW6wI+CvkuVOxziZdZaYfVYaBm3oGn7zhmhC6mQhL
++B6g5NqzANlaty3OBCufl4yvAKMFw4M8GLc0nxtSdVdAwEKiI45gZY3WEZxwA74q
+aMZrVFACgXmYijayxqiHBUqITYEjMqrlAbpLjUNgulhKzwNNlpGhL2VeBg4t0Bpr
+NMldNutbg1Sc0PmIyIXOXmZJWtpYBm24RcrGyWCF6qikPWIEtpU9l3edLTKVmUHP
+J0hO08TMC7bDfE3qT3jB+KxGlXDPVFyO2cIn7+73llsZvricCWqr+GxTq5bCm88=
+=49PA
 -----END PGP SIGNATURE-----