passenger 5.3.4 → 6.0.1

data/dev/colorize-logs

@@ -0,0 +1,272 @@
+#!/usr/bin/env ruby
+require 'optparse'
+
+RED = "\e[31m"
+YELLOW = "\e[33m"
+WHITE = "\e[37m"
+BRIGHTWHITE = "\e[37;1m"
+ORANGE = "\e[38;5;208m"
+GREEN34 = "\e[38;5;34m"
+GREEN48 = "\e[38;5;48m"
+UNDERLINE = "\e[4m"
+BOLD = "\e[1m"
+RESET = "\e[0m"
+
+TERMINATION_SIGNALS = [
+  Signal.list['INT'],
+  Signal.list['TERM'],
+  Signal.list['HUP']
+]
+
+def main
+  STDOUT.sync = true
+  STDERR.sync = true
+
+  options = parse_options(ARGV)
+
+  if should_use_pager?(options)
+    # Pipe our output to 'less'. We *must* replace the current
+    # process with 'less' (and move ourselves into the background),
+    # instead of having 'less' run as a child process. This is
+    # in order to properly handle signals sent to the entire
+    # process group, such as when the user presses Ctrl-C.
+    #
+    # The problem with running 'less' as a child process is as follows:
+    #
+    # Imagine you're running the following pipeline in
+    # bash:
+    #
+    #   tail -n 1000 -f nginx-error.log | ./dev/colorize-logs | less
+    #
+    # No problem here when we press Ctrl-C. Ctrl-C sends SIGINT to
+    # the entire process group, so to all three processes. 'tail' and
+    # 'colorize-logs' exit, while 'less' ignores the signal and keeps
+    # running until you press 'q'.
+    #
+    # Now consider the following pipeline:
+    #
+    #  tail -n 1000 -f nginx-error.log | ./dev/colorize-logs
+    #
+    # Same thing, but colorize-logs spawns 'less'. Bash does not know
+    # about it: it only waits for 'tail' and 'colorize-logs', not 'less'.
+    # When you press Ctrl-C now, bash tries to take back control of the
+    # terminal as soon as 'tail' and 'colorize-logs' exit. So although
+    # 'less' ignores SIGINT, the fact that bash tries to take control
+    # of the terminal breaks it.
+    #
+    # To avoid this scenario from happening, we inverse the process
+    # hierarchy. We replace 'colorize-logs' with 'less' (through the use
+    # of #exec) so that it's as if bash waits for 'tail' and 'less'.
+
+    a, b = IO.pipe
+
+    fork do
+      begin
+        a.close
+        STDOUT.reopen(b)
+        input = open_input(options)
+        begin
+          process_input(input)
+        ensure
+          kill_input_program(input)
+        end
+      rescue SignalException => e
+        if TERMINATION_SIGNALS.include?(e.signo)
+          # Stop upon receiving any of these signals.
+          exit 1
+        else
+          raise e
+        end
+      rescue Errno::EPIPE
+        # Stop when 'less' exits.
+      rescue Exception => e
+        STDERR.puts "#{e} (#{e.class})\n#{e.backtrace.join("\n")}"
+      end
+    end
+
+    STDIN.reopen(a)
+    b.close
+    exec('less', '-R')
+  else
+    input = open_input(options)
+    begin
+      process_input(input)
+    rescue SignalException => e
+      if TERMINATION_SIGNALS.include?(e.signo)
+        # Stop upon receiving any of these signals.
+        exit 1
+      else
+        raise e
+      end
+    rescue Errno::EPIPE
+      # Ignore error when unable to write to piped program.
+    ensure
+      kill_input_program(input)
+    end
+  end
+end
+
+def parse_options(argv)
+  options = {}
+
+  parser = OptionParser.new do |opts|
+    opts.banner =
+      "Usage 1: ./dev/colorize-logs [options] <filename>\n" \
+      "Usage 2: some command | ./dev/colorize-logs [options]"
+
+    opts.separator ''
+    opts.separator 'This is a tool for reading big Passenger log files,' \
+      ' which can be hard to parse because they contain so much information.' \
+      ' This tool colorizes the logs based on log level (error, warning,' \
+      ' notice, debug, etc.) and type (LoggingKit vs app output), hopefully' \
+      ' making it easier to read.'
+    opts.separator ''
+    opts.separator 'You can have it read a file (usage 1), or you can pipe' \
+      ' data into it (usage 2).'
+    opts.separator ''
+    opts.separator "Output will automatically be displayed in 'less' if:" \
+      " (1) running in a terminal, (2) a filename is given, and (3) -f is NOT given."
+    opts.separator ''
+    opts.separator 'Options:'
+
+    opts.on('-f', '--follow', "Follow given file (like 'tail -f'). Only applicable when given a filename") do
+      options[:follow] = true
+    end
+    opts.on('-h', '--help', 'Display this help message') do
+      options[:help] = true
+    end
+  end
+
+  begin
+    parser.parse!(argv)
+  rescue OptionParser::ParseError => e
+    STDERR.puts e
+    STDERR.puts
+    STDERR.puts "Please see '--help' for valid options."
+    exit 1
+  end
+
+  if options[:help]
+    puts parser
+    exit
+  end
+
+  if argv.size > 1
+    STDERR.puts 'ERROR: too many filenames given.'
+    STDERR.puts
+    STDERR.puts "Please see '--help' for usage."
+    exit 1
+  end
+
+  if argv.size == 1 && argv[0] != '-'
+    options[:filename] = argv[0]
+  end
+
+  if options[:follow] && !options[:filename]
+    STDERR.puts 'ERROR: --follow can only be used when given a filename.'
+    STDERR.puts
+    STDERR.puts "Please see '--help' for usage."
+    exit 1
+  end
+
+  options
+end
+
+def open_input(options)
+  if options[:filename]
+    if options[:follow]
+      IO.popen(['tail', '-n', '0', '-f', options[:filename]], 'r:utf-8')
+    else
+      File.open(options[:filename], 'r:utf-8')
+    end
+  else
+    STDIN
+  end
+end
+
+def kill_input_program(input)
+  if input.pid
+    begin
+      Process.kill('TERM', input.pid)
+    rescue Errno::ESRCH
+      # Ignore error
+    rescue SystemCallError => e
+      STDERR.puts "WARNING: unable to kill 'tail -f' (PID #{input.pid}): #{e}"
+    end
+  end
+end
+
+def should_use_pager?(options)
+  STDOUT.tty? && options[:filename] && !options[:follow]
+end
+
+def process_input(input)
+  last_message_color = nil
+  while !input.eof?
+    line, last_message_color = colorize(input.readline.chomp, last_message_color)
+    puts line
+  end
+end
+
+def colorize(line, last_message_color)
+  if line=~ /^\[ .+? \]: /
+    colorize_loggingkit_line(line)
+  elsif line =~ /^App [0-9]+ output: /
+    colorize_app_output_line(line)
+  else
+    ["#{last_message_color}#{line}#{RESET}", last_message_color]
+  end
+end
+
+def colorize_loggingkit_line(line)
+  case line
+  when /^\[ [CE]/
+    prefix_color  = "\e[38;5;88m"
+    message_color = RED
+  when /^\[ W/
+    prefix_color  = "\e[38;5;136m"
+    message_color = YELLOW
+  when /^\[ N/
+    prefix_color  = "\e[38;5;250m"
+    message_color = BRIGHTWHITE
+  when /^\[ I/
+    prefix_color  = "\e[38;5;246m"
+    message_color = "\e[38;5;255m"
+  when /^\[ D /
+    prefix_color  = "\e[38;5;169m"
+    message_color = "\e[38;5;213m"
+  when /^\[ D2/
+    prefix_color  = "\e[38;5;96m"
+    message_color = "\e[38;5;132m"
+  when /^\[ D3/
+    prefix_color  = "\e[38;5;74m"
+    message_color = "\e[38;5;117m"
+  else
+    prefix_color  = "\e[38;5;245m"
+    message_color = RESET
+  end
+
+  message_start_index = line.index(' ]: ') + 3
+  prefix = line[0 .. message_start_index - 1]
+  message = line[message_start_index + 1 .. -1]
+
+  if message =~ /^\[.+?\]/
+    offset = Regexp.last_match.offset(0)
+    subprefix = message[0 .. offset.last - 1]
+    submessage = message[offset.last + 1 .. -1]
+
+    ["#{prefix_color}#{prefix}#{RESET} #{UNDERLINE}#{message_color}#{subprefix}#{RESET} #{message_color}#{submessage}#{RESET}", message_color]
+  else
+    ["#{prefix_color}#{prefix}#{RESET} #{message_color}#{message}#{RESET}", message_color]
+  end
+end
+
+def colorize_app_output_line(line)
+  message_start_index  = line.index(' output: ') + 8
+  prefix = line[0 .. message_start_index - 1]
+  message = line[message_start_index .. -1]
+
+  ["#{GREEN34}#{prefix}#{RESET}#{GREEN48}#{message}#{RESET}", WHITE]
+end
+
+main

data/dev/show-latest-crashlog-dir

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# Finds the latest Passenger crash log directory and prints its path.
+# This tool is meant to make it easy to analyze local Passenger crash
+# logs during debugging sessions. Instead of searching for the crash
+# log directory path in the output and then copy-pasting that to the
+# terminal, one can simply invoke one shell command:
+#
+#   less $(./dev/show-latest-crashlog-dir)/backtrace.log
+#
+# This will open the latest crash log's backtrace.log in 'less'.
+
+def parse_path(path)
+  File.basename(path).split('.')[1].to_i
+end
+
+def main
+  dirs = Dir["/var/tmp/passenger-crash-log.*.*"].sort do |a, b|
+    parse_path(a) <=> parse_path(b)
+  end
+  if dirs.empty?
+    abort "No /var/tmp/passenger-crash-log.* directories found."
+  else
+    puts dirs.last
+  end
+end
+
+main

data/resources/templates/standalone/http.erb

@@ -34,6 +34,8 @@ passenger_user_switching off;
 <%= nginx_http_option(:instance_registry_dir) %>
 <%= nginx_http_option(:disable_security_update_check) %>
 <%= nginx_http_option(:security_update_check_proxy) %>
+<%= nginx_http_option(:disable_anonymous_telemetry) %>
+<%= nginx_http_option(:anonymous_telemetry_proxy) %>
 <%= nginx_http_option(:data_buffer_dir) %>
 <%= nginx_http_option(:core_file_descriptor_ulimit) %>
 <%= nginx_http_option(:admin_panel_url) %>

data/resources/templates/standalone/server.erb

@@ -41,6 +41,7 @@ passenger_enabled on;
 <%= nginx_option(app, :spawn_method) %>
 <%= nginx_option(app, :app_type) %>
 <%= nginx_option(app, :startup_file) %>
+<%= nginx_option(app, :app_start_command) %>
 <%= nginx_option(app, :start_timeout) %>
 <%= nginx_option(app, :min_instances) %>
 <%= nginx_option(app, :max_request_queue_size) %>

data/src/agent/AgentMain.cpp

@@ -36,6 +36,7 @@ int systemMetricsMain(int argc, char *argv[]);
 int tempDirToucherMain(int argc, char *argv[]);
 int spawnEnvSetupperMain(int argc, char *argv[]);
 int execHelperMain(int argc, char *argv[]);
+int fileReadHelperMain(int argc, char *argv[]);
 
 static bool
 isHelp(const char *arg) {
@@ -58,6 +59,7 @@ usage(int argc, char *argv[]) {
 	printf("Utility subcommands:\n");
 	printf("  system-metrics\n");
 	printf("  exec-helper\n");
+	printf("  file-read-helper\n");
 }
 
 static bool
@@ -90,6 +92,8 @@ dispatchSubcommand(int argc, char *argv[]) {
 		exit(spawnEnvSetupperMain(argc, argv));
 	} else if (strcmp(argv[1], "exec-helper") == 0) {
 		exit(execHelperMain(argc, argv));
+	} else if (strcmp(argv[1], "file-read-helper") == 0) {
+		exit(fileReadHelperMain(argc, argv));
 	} else if (strcmp(argv[1], "test-binary") == 0) {
 		printf("PASS\n");
 		exit(0);

data/src/agent/Core/AdminPanelConnector.h

@@ -49,8 +49,8 @@
 #include <FileTools/FileManip.h>
 #include <SystemTools/UserDatabase.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/IOUtils.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <IOTools/IOUtils.h>
 #include <Utils/AsyncSignalSafeUtils.h>
 #include <LoggingKit/Context.h>
 
@@ -193,7 +193,7 @@ private:
 		args.push_back("system-properties");
 
 		int status = 0;
-		string output;
+		SubprocessOutput output;
 		try {
 			runInternalRubyTool(*resourceLocator, ruby, args, &status, &output);
 		} catch (const std::exception &e) {
@@ -206,7 +206,7 @@ private:
 
 		server.getIoService().post(boost::bind(
 			&AdminPanelConnector::onGetServerPropertiesDone, this,
-			conn, doc, output, status, string()
+			conn, doc, output.data, status, string()
 		));
 	}
 
@@ -433,7 +433,7 @@ private:
 			pair<uid_t, gid_t> ids;
 			try {
 				ids = appPool->getGroupRunUidAndGids(key);
-			} catch (RuntimeException e) {
+			} catch (const RuntimeException &) {
 				files = Json::nullValue;
 			}
 			if (!files.isNull()) {
@@ -470,7 +470,7 @@ private:
 						dup2(pipe.second, STDOUT_FILENO);
 						pipe.first.close();
 						pipe.second.close();
-						closeAllFileDescriptors(2, true);
+						closeAllFileDescriptors(2);
 
 						execvp(execArgs[0], (char * const *) &execArgs[0]);
 

data/src/agent/Core/ApiServer.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2013-2017 Phusion Holding B.V.
+ *  Copyright (c) 2013-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -50,9 +50,9 @@
 #include <LoggingKit/LoggingKit.h>
 #include <LoggingKit/Context.h>
 #include <Constants.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/BufferedIO.h>
-#include <Utils/MessageIO.h>
+#include <IOTools/BufferedIO.h>
+#include <IOTools/MessageIO.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace Core {

data/src/agent/Core/ApplicationPool/BasicProcessInfo.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -33,7 +33,7 @@
 
 #include <StaticString.h>
 #include <Exceptions.h>
-#include <Utils/JsonUtils.h>
+#include <JsonTools/JsonUtils.h>
 #include <Core/ApplicationPool/BasicGroupInfo.h>
 #include <Core/SpawningKit/Result.h>
 

data/src/agent/Core/ApplicationPool/Context.h

@@ -86,10 +86,14 @@ public:
 		return spawningKitFactory->getContext();
 	}
 
-	ResourceLocator *getResourceLocator() const {
+	const ResourceLocator *getResourceLocator() const {
 		return getSpawningKitContext()->resourceLocator;
 	}
 
+	const WrapperRegistry::Registry *getWrapperRegistry() const {
+		return getSpawningKitContext()->wrapperRegistry;
+	}
+
 	const RandomGeneratorPtr &getRandomGenerator() const {
 		return getSpawningKitContext()->randomGenerator;
 	}

data/src/agent/Core/ApplicationPool/Group/InternalUtils.cpp

@@ -295,7 +295,7 @@ Group::assignSessionsToGetWaitersQuickly(Lock &lock) {
 		return;
 	}
 
-	SmallVector<GetAction, 8> actions;
+	boost::container::small_vector<GetAction, 8> actions;
 	unsigned int i = 0;
 	bool done = false;
 
@@ -320,7 +320,7 @@ Group::assignSessionsToGetWaitersQuickly(Lock &lock) {
 
 	verifyInvariants();
 	lock.unlock();
-	SmallVector<GetAction, 50>::const_iterator it, end = actions.end();
+	boost::container::small_vector<GetAction, 50>::const_iterator it, end = actions.end();
 	for (it = actions.begin(); it != end; it++) {
 		it->callback(it->session, ExceptionPtr());
 	}

data/src/agent/Core/ApplicationPool/Group/LifetimeAndBasics.cpp

@@ -99,6 +99,11 @@ Group::getResourceLocator() const {
 	return *getPool()->getSpawningKitContext()->resourceLocator;
 }
 
+const WrapperRegistry::Registry &
+Group::getWrapperRegistry() const {
+	return *getPool()->getSpawningKitContext()->wrapperRegistry;
+}
+
 
 } // namespace ApplicationPool2
 } // namespace Passenger

data/src/agent/Core/ApplicationPool/Group/Miscellaneous.cpp

@@ -53,7 +53,8 @@ Group::cleanupSpawner(boost::container::vector<Callback> &postLockActions) {
 
 bool
 Group::authorizeByUid(uid_t uid) const {
-	return uid == 0 || SpawningKit::prepareUserSwitching(options).uid == uid;
+	return uid == 0 || SpawningKit::prepareUserSwitching(options,
+		getWrapperRegistry()).uid == uid;
 }
 
 bool

data/src/agent/Core/ApplicationPool/Group/OutOfBandWork.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -24,7 +24,7 @@
  *  THE SOFTWARE.
  */
 #include <Core/ApplicationPool/Group.h>
-#include <MessageReadersWriters.h>
+#include <IOTools/MessageSerialization.h>
 
 /*************************************************************************
  *
@@ -228,7 +228,7 @@ Group::spawnThreadOOBWRequest(GroupPtr self, ProcessPtr process) {
 		// This is copied from Core::Controller when it is sending data using the
 		// "session" protocol.
 		char sizeField[sizeof(boost::uint32_t)];
-		SmallVector<StaticString, 10> data;
+		boost::container::small_vector<StaticString, 10> data;
 
 		data.push_back(StaticString(sizeField, sizeof(boost::uint32_t)));
 		data.push_back(P_STATIC_STRING_WITH_NULL("REQUEST_METHOD"));

data/src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp

@@ -153,7 +153,7 @@ Group::addProcessToList(const ProcessPtr &process, ProcessList &destination) {
 		assert(process->isAlive());
 		process->enabled = Process::DETACHED;
 
-		if (!this->options.abortWebsocketsOnProcessShutdown && this->options.appType == P_STATIC_STRING("node")) {
+		if (!this->options.abortWebsocketsOnProcessShutdown && this->options.appType == P_STATIC_STRING("nodejs")) {
 			// When Passenger is not allowed to abort websockets the application needs a way to know graceful shutdown
 			// is in progress. The solution for the most common use (Node.js) is to send a SIGINT. This is the general
 			// termination signal for Node; later versions of pm2 also use it (with a 1.6 sec grace period, Passenger just waits)

data/src/agent/Core/ApplicationPool/Group/StateInspection.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -162,14 +162,15 @@ Group::inspectXml(std::ostream &stream, bool includeSecrets) const {
 		P_BUG("Unknown 'lifeStatus' state " << lifeStatus);
 	}
 
-	SpawningKit::UserSwitchingInfo usInfo(SpawningKit::prepareUserSwitching(options));
+	SpawningKit::UserSwitchingInfo usInfo(SpawningKit::prepareUserSwitching(options,
+		getWrapperRegistry()));
 	stream << "<user>" << escapeForXml(usInfo.username) << "</user>";
 	stream << "<uid>" << usInfo.uid << "</uid>";
 	stream << "<group>" << escapeForXml(usInfo.groupname) << "</group>";
 	stream << "<gid>" << usInfo.gid << "</gid>";
 
 	stream << "<options>";
-	options.toXml(stream, getResourceLocator());
+	options.toXml(stream, getResourceLocator(), getWrapperRegistry());
 	stream << "</options>";
 
 	stream << "<processes>";
@@ -201,22 +202,14 @@ Group::inspectXml(std::ostream &stream, bool includeSecrets) const {
 void
 Group::inspectPropertiesInAdminPanelFormat(Json::Value &result) const {
 	result["path"] = absolutizePath(options.appRoot);
-	result["startup_file"] = absolutizePath(options.getStartupFile(), absolutizePath(options.appRoot));
-	result["start_command"] = options.getStartCommand(getResourceLocator());
-
-	if (options.appType == "rack") {
-		result["type"] = "ruby";
-	} else if (options.appType == "wsgi") {
-		result["type"] = "python";
-	} else if (options.appType == "node") {
-		result["type"] = "nodejs";
-	} else if (options.appType == "meteor") {
-		result["type"] = "meteor";
-	} else {
-		result["type"] = "generic";
-	}
-
-	SpawningKit::UserSwitchingInfo usInfo(SpawningKit::prepareUserSwitching(options));
+	result["startup_file"] = absolutizePath(options.getStartupFile(getWrapperRegistry()),
+		absolutizePath(options.appRoot));
+	result["start_command"] = options.getStartCommand(getResourceLocator(),
+		getWrapperRegistry());
+	result["type"] = getWrapperRegistry().lookup(options.appType).language.toString();
+
+	SpawningKit::UserSwitchingInfo usInfo(SpawningKit::prepareUserSwitching(options,
+		getWrapperRegistry()));
 	result["user"]["username"] = usInfo.username;
 	result["user"]["uid"] = (Json::Int) usInfo.uid;
 	result["group"]["groupname"] = usInfo.groupname;
@@ -240,7 +233,7 @@ Group::inspectConfigInAdminPanelFormat(Json::Value &result) const {
 
 	result["type"] = NON_EMPTY_SVAL(options.appType);
 	result["startup_file"] = NON_EMPTY_SVAL(options.startupFile);
-	result["start_command"] = NON_EMPTY_SVAL(replaceAll(options.startCommand,
+	result["start_command"] = NON_EMPTY_SVAL(replaceAll(options.appStartCommand,
 		P_STATIC_STRING("\t"), P_STATIC_STRING(" ")));
 	result["ruby"] = SVAL(options.ruby, DEFAULT_RUBY);
 	result["python"] = SVAL(options.python, DEFAULT_PYTHON);

data/src/agent/Core/ApplicationPool/Group.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -36,6 +36,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/container/vector.hpp>
+#include <boost/container/small_vector.hpp>
 #include <boost/atomic.hpp>
 #include <oxt/macros.hpp>
 #include <oxt/thread.hpp>
@@ -44,8 +45,8 @@
 #include <sys/stat.h>
 #include <cstdlib>
 #include <cassert>
-#include <SmallVector.h>
 #include <MemoryKit/palloc.h>
+#include <WrapperRegistry/Registry.h>
 #include <Hooks.h>
 #include <Utils.h>
 #include <Core/ApplicationPool/Common.h>
@@ -438,6 +439,7 @@ public:
 	Context *getContext() const;
 	psg_pool_t *getPallocPool() const;
 	const ResourceLocator &getResourceLocator() const;
+	const WrapperRegistry::Registry &getWrapperRegistry() const;
 
 	/****** Session management ******/
 

data/src/agent/Core/ApplicationPool/Implementation.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -37,12 +37,12 @@
 #include <oxt/backtrace.hpp>
 #include <Exceptions.h>
 #include <Hooks.h>
-#include <MessageReadersWriters.h>
+#include <IOTools/MessageSerialization.h>
 #include <Utils.h>
-#include <Utils/IOUtils.h>
+#include <IOTools/IOUtils.h>
 #include <Utils/ScopeGuard.h>
-#include <Utils/MessageIO.h>
-#include <Utils/JsonUtils.h>
+#include <IOTools/MessageIO.h>
+#include <JsonTools/JsonUtils.h>
 #include <Core/ApplicationPool/Pool.h>
 #include <Core/ApplicationPool/Group.h>
 #include <Core/ApplicationPool/Pool/InitializationAndShutdown.cpp>