passenger 4.0.45 → 4.0.46

data/lib/phusion_passenger/union_station/transaction.rb

@@ -0,0 +1,168 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2014 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+PhusionPassenger.require_passenger_lib 'debug_logging'
+PhusionPassenger.require_passenger_lib 'union_station/core'
+PhusionPassenger.require_passenger_lib 'utils/native_support_utils'
+
+module PhusionPassenger
+module UnionStation
+
+class Transaction
+	include DebugLogging
+
+	attr_reader :txn_id
+
+	def initialize(connection = nil, txn_id = nil)
+		if connection
+			@connection = connection
+			@txn_id = txn_id
+			connection.ref
+		end
+	end
+
+	def null?
+		return !@connection || !@connection.connected?
+	end
+
+	def message(text)
+		if !@connection
+			timestamp_string = Core.timestamp_string
+			trace(3, "[Union Station log to null] #{@txn_id} #{timestamp_string} #{text}")
+			return
+		end
+		@connection.synchronize do
+			return if !@connection.connected?
+			begin
+				timestamp_string = Core.timestamp_string
+				trace(3, "[Union Station log] #{@txn_id} #{timestamp_string} #{text}")
+				@connection.channel.write("log", @txn_id, timestamp_string)
+				@connection.channel.write_scalar(text)
+			rescue SystemCallError, IOError => e
+				@connection.disconnect
+				warn("Error communicating with the logging agent: #{e.message}")
+			rescue Exception => e
+				@connection.disconnect
+				raise e
+			end
+		end
+	end
+
+	def begin_measure(name, extra_info = nil)
+		if extra_info
+			extra_info_base64 = [extra_info].pack("m")
+			extra_info_base64.gsub!("\n", "")
+			extra_info_base64.strip!
+		else
+			extra_info_base64 = nil
+		end
+		times = Utils::NativeSupportUtils.process_times
+		message "BEGIN: #{name} (#{current_timestamp.to_s(36)},#{times.utime.to_s(36)},#{times.stime.to_s(36)}) #{extra_info_base64}"
+	end
+
+	def end_measure(name, error_encountered = false)
+		times = Utils::NativeSupportUtils.process_times
+		if error_encountered
+			message "FAIL: #{name} (#{current_timestamp.to_s(36)},#{times.utime.to_s(36)},#{times.stime.to_s(36)})"
+		else
+			message "END: #{name} (#{current_timestamp.to_s(36)},#{times.utime.to_s(36)},#{times.stime.to_s(36)})"
+		end
+	end
+
+	def measure(name, extra_info = nil)
+		begin_measure(name, extra_info)
+		begin
+			yield
+		rescue Exception
+			error = true
+			is_closed = closed?
+			raise
+		ensure
+			end_measure(name, error) if !is_closed
+		end
+	end
+
+	def measured_time_points(name, begin_time, end_time, extra_info = nil)
+		if extra_info
+			extra_info_base64 = [extra_info].pack("m")
+			extra_info_base64.gsub!("\n", "")
+			extra_info_base64.strip!
+		else
+			extra_info_base64 = nil
+		end
+		begin_timestamp = begin_time.to_i * 1_000_000 + begin_time.usec
+		end_timestamp = end_time.to_i * 1_000_000 + end_time.usec
+		message "BEGIN: #{name} (#{begin_timestamp.to_s(36)}) #{extra_info_base64}"
+		message "END: #{name} (#{end_timestamp.to_s(36)})"
+	end
+
+	def close(flush_to_disk = false)
+		@connection.synchronize do
+			return if !@connection.connected?
+			begin
+				# We need an ACK here. See thread_handler.rb finalize_request.
+				@connection.channel.write("closeTransaction", @txn_id,
+					Core.timestamp_string, true)
+				result = @connection.channel.read
+				if result != ["ok"]
+					raise "Expected logging agent to respond with 'ok', but got #{result.inspect} instead"
+				end
+				if flush_to_disk
+					@connection.channel.write("flush")
+					result = @connection.channel.read
+					if result != ["ok"]
+						raise "Invalid logging agent response #{result.inspect} to the 'flush' command"
+					end
+				end
+			rescue SystemCallError, IOError => e
+				@connection.disconnect
+				warn("Error communicating with the logging agent: #{e.message}")
+			rescue Exception => e
+				@connection.disconnect
+				raise e
+			ensure
+				@connection.unref
+				@connection = nil
+			end
+		end if @connection
+	end
+
+	def closed?
+		if @connection
+			@connection.synchronize do
+				return !@connection.connected?
+			end
+		else
+			return nil
+		end
+	end
+
+private
+	def current_timestamp
+		time = Core.current_time
+		return time.to_i * 1_000_000 + time.usec
+	end
+end
+
+end # module UnionStation
+end # module PhusionPassenger

data/lib/phusion_passenger/utils.rb

@@ -57,6 +57,10 @@ module Utils
 		end
 	end
 	
+	def home_dir
+		Etc.getpwuid(Process.uid).dir
+	end
+
 	# Print the given exception, including the stack trace, to STDERR.
 	#
 	# +current_location+ is a string which describes where the code is

data/lib/phusion_passenger/utils/lock.rb

@@ -0,0 +1,62 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2014 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+module PhusionPassenger
+module Utils
+
+class Lock
+	def initialize(mutex)
+		@mutex = mutex
+		@locked = false
+	end
+
+	def reset(mutex, lock_now = true)
+		unlock if @locked
+		@mutex = mutex
+		lock if lock_now
+	end
+
+	def synchronize
+		lock if !@locked
+		begin
+			yield(self)
+		ensure
+			unlock if @locked
+		end
+	end
+
+	def lock
+		raise if @locked
+		@mutex.lock
+		@locked = true
+	end
+
+	def unlock
+		raise if !@locked
+		@mutex.unlock
+		@locked = false
+	end
+end
+
+end # module Utils
+end # module PhusionPassenger

data/resources/mime.types

@@ -53,6 +53,7 @@ types {
     application/x-shockwave-flash         swf;
     application/x-stuffit                 sit;
     application/x-tcl                     tcl tk;
+    application/x-web-app-manifest+json   webapp;
     application/x-x509-ca-cert            der pem crt;
     application/x-xpinstall               xpi;
     application/zip                       zip;

data/resources/templates/error_layout.html.template

@@ -34,6 +34,8 @@
 				{{CONTENT|raw}}
 
 				<dl>
+				<dt>Error ID</dt>
+				<dd>{{ERROR_ID}}</dd>
 				<dt>Application root</dt>
 				<dd>{{APP_ROOT}}</dd>
 				<dt>Environment (value of RAILS_ENV, RACK_ENV, WSGI_ENV, NODE_ENV and PASSENGER_APP_ENV)</dt>

data/resources/templates/standalone/config.erb

@@ -61,6 +61,7 @@ http {
     <% if @options[:temp_dir] %>passenger_temp_dir '<%= @options[:temp_dir] %>';<% end %>
     <% if @options[:rolling_restarts] %>passenger_rolling_restarts on;<% end %>
     <% if @options[:resist_deployment_errors] %>passenger_resist_deployment_errors on;<% end %>
+    <% if !@options[:load_shell_envvars] %>passenger_load_shell_envvars off;<% end %>
 
     <% if !@options[:friendly_error_pages].nil? -%>
         passenger_friendly_error_pages <%= boolean_config_value(@options[:friendly_error_pages]) %>;

data/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp

@@ -32,7 +32,7 @@ namespace tut {
 		
 		boost::shared_ptr<DirectSpawner> createSpawner(const Options &options) {
 			return boost::make_shared<DirectSpawner>(
-				*resourceLocator, generation);
+				generation, make_shared<SpawnerConfig>(*resourceLocator));
 		}
 		
 		Options createOptions() {
@@ -62,7 +62,8 @@ namespace tut {
 		options.startupFile  = ".";
 		options.startTimeout = 300;
 		
-		DirectSpawner spawner(*resourceLocator, generation);
+		DirectSpawner spawner(generation, make_shared<SpawnerConfig>(*resourceLocator));
+		setLogLevel(LVL_CRIT);
 		
 		try {
 			process = spawner.spawn(options);
@@ -84,7 +85,8 @@ namespace tut {
 		options.startCommand = "perl\t" "-e\t" "print STDERR \"hello world\\n\"";
 		options.startupFile  = ".";
 		
-		DirectSpawner spawner(*resourceLocator, generation);
+		DirectSpawner spawner(generation, make_shared<SpawnerConfig>(*resourceLocator));
+		setLogLevel(LVL_CRIT);
 		
 		try {
 			process = spawner.spawn(options);

data/test/cxx/ApplicationPool2/PoolTest.cpp

@@ -33,9 +33,9 @@ namespace tut {
 		ApplicationPool2_PoolTest() {
 			createServerInstanceDirAndGeneration(serverInstanceDir, generation);
 			retainSessions = false;
-			spawnerConfig = boost::make_shared<SpawnerConfig>();
-			spawnerFactory = boost::make_shared<SpawnerFactory>(*resourceLocator,
-				generation, spawnerConfig);
+			spawnerConfig = boost::make_shared<SpawnerConfig>(*resourceLocator);
+			spawnerFactory = boost::make_shared<SpawnerFactory>(generation,
+				spawnerConfig);
 			pool = boost::make_shared<Pool>(spawnerFactory);
 			pool->initialize();
 			callback = boost::bind(&ApplicationPool2_PoolTest::_callback, this, _1, _2);
@@ -636,6 +636,7 @@ namespace tut {
 		Options options = createOptions();
 		options.appRoot = "tmp.wsgi";
 		options.appType = "wsgi";
+		options.startupFile = "passenger_wsgi.py";
 		options.spawnMethod = "direct";
 		options.minProcesses = 0;
 		initPoolDebugging();
@@ -781,6 +782,7 @@ namespace tut {
 		// Create a group tmp.wsgi.
 		options1.appRoot = "tmp.wsgi";
 		options1.appType = "wsgi";
+		options1.startupFile = "passenger_wsgi.py";
 		options1.spawnMethod = "direct";
 		SystemTime::force(1);
 		session = pool->get(options1, &ticket);
@@ -1470,6 +1472,7 @@ namespace tut {
 		Options options = createOptions();
 		options.appRoot = "tmp.wsgi";
 		options.appType = "wsgi";
+		options.startupFile = "passenger_wsgi.py";
 		options.spawnMethod = "direct";
 		pool->setMax(1);
 
@@ -1505,6 +1508,7 @@ namespace tut {
 		Options options = createOptions();
 		options.appRoot = "tmp.wsgi";
 		options.appType = "wsgi";
+		options.startupFile = "passenger_wsgi.py";
 		options.spawnMethod = "direct";
 
 		writeFile("tmp.wsgi/passenger_wsgi.py",
@@ -1529,6 +1533,7 @@ namespace tut {
 		Options options = createOptions();
 		options.appRoot = "tmp.wsgi";
 		options.appType = "wsgi";
+		options.startupFile = "passenger_wsgi.py";
 		options.spawnMethod = "direct";
 		options.minProcesses = 4;
 
@@ -1571,6 +1576,7 @@ namespace tut {
 		Options options = createOptions();
 		options.appRoot = "stub/wsgi";
 		options.appType = "wsgi";
+		options.startupFile = "passenger_wsgi.py";
 		options.spawnMethod = "direct";
 
 		pool->asyncGet(options, callback);
@@ -1733,6 +1739,7 @@ namespace tut {
 		Options options = createOptions();
 		options.appRoot = "tmp.wsgi";
 		options.appType = "wsgi";
+		options.startupFile = "passenger_wsgi.py";
 		options.spawnMethod = "direct";
 		pool->setMax(1);
 
@@ -1782,6 +1789,7 @@ namespace tut {
 		Options options = createOptions();
 		options.appRoot = "tmp.wsgi";
 		options.appType = "wsgi";
+		options.startupFile = "passenger_wsgi.py";
 		options.spawnMethod = "direct";
 		options.minProcesses = 2;
 
@@ -1815,6 +1823,7 @@ namespace tut {
 		Options options = createOptions();
 		options.appRoot = "tmp.wsgi";
 		options.appType = "wsgi";
+		options.startupFile = "passenger_wsgi.py";
 		options.spawnMethod = "direct";
 		options.maxOutOfBandWorkInstances = 2;
 		initPoolDebugging();
@@ -1974,6 +1983,7 @@ namespace tut {
 		Options options = createOptions();
 		options.appRoot = "tmp.wsgi";
 		options.appType = "wsgi";
+		options.startupFile = "passenger_wsgi.py";
 		options.spawnMethod = "direct";
 
 		SessionPtr session = pool->get(options, &ticket);

data/test/cxx/ApplicationPool2/SmartSpawnerTest.cpp

@@ -47,10 +47,10 @@ namespace tut {
 			}
 			
 			return boost::make_shared<SmartSpawner>(
-				*resourceLocator,
 				generation,
 				command,
-				options);
+				options,
+				make_shared<SpawnerConfig>(*resourceLocator));
 		}
 		
 		Options createOptions() {
@@ -78,6 +78,7 @@ namespace tut {
 		options.startCommand = "ruby\t" "start.rb";
 		options.startupFile  = "start.rb";
 		boost::shared_ptr<SmartSpawner> spawner = createSpawner(options);
+		setLogLevel(LVL_CRIT);
 		process = spawner->spawn(options);
 		process->requiresShutdown = false;
 		
@@ -86,7 +87,6 @@ namespace tut {
 		usleep(300000);
 		
 		// No exception at next spawn.
-		setLogLevel(-1);
 		process = spawner->spawn(options);
 		process->requiresShutdown = false;
 	}
@@ -98,7 +98,7 @@ namespace tut {
 		options.appRoot      = "stub/rack";
 		options.startCommand = "ruby\t" "start.rb";
 		options.startupFile  = "start.rb";
-		setLogLevel(-1);
+		setLogLevel(LVL_CRIT);
 		boost::shared_ptr<SmartSpawner> spawner = createSpawner(options, true);
 		try {
 			process = spawner->spawn(options);
@@ -124,10 +124,11 @@ namespace tut {
 		preloaderCommand.push_back("-c");
 		preloaderCommand.push_back("echo hello world >&2; sleep 60");
 		SmartSpawner spawner(
-			*resourceLocator,
 			generation,
 			preloaderCommand,
-			options);
+			options,
+			make_shared<SpawnerConfig>(*resourceLocator));
+		setLogLevel(LVL_CRIT);
 		
 		try {
 			process = spawner.spawn(options);
@@ -154,11 +155,12 @@ namespace tut {
 		preloaderCommand.push_back("-c");
 		preloaderCommand.push_back("echo hello world >&2");
 		SmartSpawner spawner(
-			*resourceLocator,
 			generation,
 			preloaderCommand,
-			options);
-		
+			options,
+			make_shared<SpawnerConfig>(*resourceLocator));
+		setLogLevel(LVL_CRIT);
+
 		try {
 			process = spawner.spawn(options);
 			process->requiresShutdown = false;
@@ -184,10 +186,11 @@ namespace tut {
 		preloaderCommand.push_back("-c");
 		preloaderCommand.push_back("echo hello world >&2");
 		SmartSpawner spawner(
-			*resourceLocator,
 			generation,
 			preloaderCommand,
-			options);
+			options,
+			make_shared<SpawnerConfig>(*resourceLocator));
+		setLogLevel(LVL_CRIT);
 		
 		try {
 			process = spawner.spawn(options);
@@ -211,10 +214,10 @@ namespace tut {
 			preloaderCommand.push_back("ruby");
 			preloaderCommand.push_back(resourceLocator->getHelperScriptsDir() + "/rack-preloader.rb");
 			SmartSpawner spawner(
-				*resourceLocator,
 				generation,
 				preloaderCommand,
-				options);
+				options,
+				make_shared<SpawnerConfig>(*resourceLocator));
 			process = spawner.spawn(options);
 			process->requiresShutdown = false;
 		}