passenger 5.3.1 → 5.3.2

data/src/helper-scripts/meteor-loader.rb

@@ -31,35 +31,92 @@ require 'logger'
 module PhusionPassenger
   module App
     def self.options
+      @@options ||= {}
       return @@options
     end
 
-    def self.exit_code_for_exception(e)
-      if e.is_a?(SystemExit)
-        return e.status
-      else
-        return 1
+    def self.try_write_file(path, contents)
+      begin
+        File.open(path, 'wb') do |f|
+          f.write(contents)
+        end
+      rescue SystemCallError => e
+        STDERR.puts "Warning: unable to write to #{path}: #{e}"
       end
     end
 
-    def self.handshake_and_read_startup_request
-      STDOUT.sync = true
-      STDERR.sync = true
-      puts "!> I have control 1.0"
-      abort "Invalid initialization header" if STDIN.readline != "You have control 1.0\n"
+    def self.record_journey_step_begin(step, state, work_dir = nil)
+      dir = work_dir || ENV['PASSENGER_SPAWN_WORK_DIR']
+      step_dir = "#{dir}/response/steps/#{step.downcase}"
+      try_write_file("#{step_dir}/state", state)
+      try_write_file("#{step_dir}/begin_time", Time.now.to_f)
+    end
 
-      @@options = {}
-      while (line = STDIN.readline) != "\n"
-        name, value = line.strip.split(/: */, 2)
-        @@options[name] = value
+    def self.record_journey_step_end(step, state, work_dir = nil)
+      dir = work_dir || ENV['PASSENGER_SPAWN_WORK_DIR']
+      step_dir = "#{dir}/response/steps/#{step.downcase}"
+      try_write_file("#{step_dir}/state", state)
+      if !File.exist?("#{step_dir}/begin_time") && !File.exist?("#{step_dir}/begin_time_monotonic")
+        try_write_file("#{step_dir}/begin_time", Time.now.to_f)
       end
+      try_write_file("#{step_dir}/end_time", Time.now.to_f)
+    end
+
+    def self.init_logging
+      logger = Logger.new(STDOUT)
+      logger.level = Logger::WARN
+      logger.formatter = proc do |severity, datetime, progname, msg|
+        "[ pid=#{Process.pid}, time=#{datetime} ]: #{msg.message}"
+      end
+    end
+
+    def self.read_startup_arguments
+	    work_dir = ENV['PASSENGER_SPAWN_WORK_DIR']
+        @@options = File.open("#{work_dir}/args.json", 'rb') do |f|
+          Utils::JSON.parse(f.read)
+        end
+    end
+
+    def self.advertise_port(port)
+      work_dir = ENV['PASSENGER_SPAWN_WORK_DIR']
+	    path = work_dir + '/response/properties.json'
+	    doc = {
+		    'sockets': [{
+				             'name': 'main',
+				             'address': "tcp://127.0.0.1:#{port}",
+				             'protocol': 'http',
+				             'concurrency': 0,
+				             'accept_http_requests': true
+			              }]
+	    }
+	    File.write(path, Utils::JSON.generate(doc))
+    end
+
+    def self.advertise_readiness
+	    work_dir = ENV['PASSENGER_SPAWN_WORK_DIR']
+	    path = work_dir + '/response/finish'
+	    File.write(path, '1')
     end
 
     def self.init_passenger
-      require "#{options["ruby_libdir"]}/phusion_passenger"
-      PhusionPassenger.locate_directories(options["passenger_root"])
-      PhusionPassenger.require_passenger_lib 'message_channel'
-      PhusionPassenger.require_passenger_lib 'utils/tmpio'
+      STDOUT.sync = true
+      STDERR.sync = true
+
+      work_dir = ENV['PASSENGER_SPAWN_WORK_DIR'].to_s
+      if work_dir.empty?
+        abort "This program may only be invoked from Passenger (error: $PASSENGER_SPAWN_WORK_DIR not set)."
+      end
+
+      ruby_libdir = File.read("#{work_dir}/args/ruby_libdir").strip
+      passenger_root = File.read("#{work_dir}/args/passenger_root").strip
+      require "#{ruby_libdir}/phusion_passenger"
+      PhusionPassenger.locate_directories(passenger_root)
+
+      PhusionPassenger.require_passenger_lib 'loader_shared_helpers'
+      PhusionPassenger.require_passenger_lib 'preloader_shared_helpers'
+      PhusionPassenger.require_passenger_lib 'utils/json'
+      require 'socket'
+
     end
 
     def self.ping_port(port)
@@ -111,15 +168,15 @@ module PhusionPassenger
         # Meteor its own process group, and sending signals to the
         # entire process group.
         Process.setpgrp
-        
+
         if options["environment"] == "production"
-          puts("Warning: meteor running in simulated production mode (--production). For real production use, bundle your app.")
+          logger.warn("Warning: meteor running in simulated production mode (--production). For real production use, bundle your app.")
         end
-        
+
         if options["meteor_app_settings"]
           PhusionPassenger.require_passenger_lib 'utils/shellwords'
           app_settings_file = Shellwords.escape(options["meteor_app_settings"])
-          puts("Using application settings from file #{app_settings_file}")
+          logger.info("Using application settings from file #{app_settings_file}")
           exec("meteor run -p #{port} --settings #{app_settings_file} #{production}")
         else
           exec("meteor run -p #{port} #{production}")
@@ -142,17 +199,47 @@ module PhusionPassenger
     ################## Main code ##################
 
 
-    handshake_and_read_startup_request
     init_passenger
+    init_logging
+
+    record_journey_step_end('SUBPROCESS_EXEC_WRAPPER', 'STEP_PERFORMED')
+
+    record_journey_step_begin('SUBPROCESS_WRAPPER_PREPARATION', 'STEP_IN_PROGRESS')
     begin
-      pid, port = load_app
+		  read_startup_arguments
+    rescue Exception
+		  record_journey_step_end('SUBPROCESS_WRAPPER_PREPARATION', 'STEP_ERRORED')
+		  raise
+	  else
+		  record_journey_step_end('SUBPROCESS_WRAPPER_PREPARATION', 'STEP_PERFORMED')
+    end
+
+    record_journey_step_begin('SUBPROCESS_APP_LOAD_OR_EXEC', 'STEP_IN_PROGRESS')
+    begin
+		  pid, port = load_app
+	  rescue Exception
+		  record_journey_step_end('SUBPROCESS_APP_LOAD_OR_EXEC', 'STEP_ERRORED')
+		  raise
+	  else
+		  record_journey_step_end('SUBPROCESS_APP_LOAD_OR_EXEC', 'STEP_PERFORMED')
+    end
+
+    record_journey_step_begin('SUBPROCESS_LISTEN', 'STEP_IN_PROGRESS')
+	  begin
       while !ping_port(port)
         sleep 0.01
       end
-      puts "!> Ready"
-      puts "!> socket: main;tcp://127.0.0.1:#{port};http_session;0"
-      puts "!> "
-      wait_for_exit_message
+	  rescue Exception
+		  record_journey_step_end('SUBPROCESS_LISTEN', 'STEP_ERRORED')
+		  raise
+	  else
+		  record_journey_step_end('SUBPROCESS_LISTEN', 'STEP_PERFORMED')
+    end
+
+    advertise_port(port)
+    advertise_readiness
+    begin
+	    wait_for_exit_message
     ensure
       if pid
         Process.kill('INT', -pid) rescue nil

data/src/helper-scripts/rack-preloader.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: binary
 #  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.

data/src/nginx_module/ConfigGeneral/AutoGeneratedDefinitions.c

@@ -226,16 +226,16 @@
     ngx_string("passenger_app_file_descriptor_ulimit"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
     passenger_conf_set_app_file_descriptor_ulimit,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, autogenerated.app_file_descriptor_ulimit),
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.app_file_descriptor_ulimit),
     NULL
 },
 {
     ngx_string("passenger_max_instances_per_app"),
     NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
     passenger_conf_set_max_instances_per_app,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, autogenerated.max_instances_per_app),
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.max_instances_per_app),
     NULL
 },
 {

data/src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c

@@ -351,10 +351,10 @@ passenger_conf_set_show_version_in_header(ngx_conf_t *cf, ngx_command_t *cmd, vo
 
 static char *
 passenger_conf_set_app_file_descriptor_ulimit(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-    passenger_loc_conf_t *passenger_conf = conf;
+    passenger_main_conf_t *passenger_conf = conf;
 
     passenger_conf->autogenerated.app_file_descriptor_ulimit_explicitly_set = 1;
-    record_loc_conf_source_location(cf, passenger_conf,
+    record_main_conf_source_location(cf,
         &passenger_conf->autogenerated.app_file_descriptor_ulimit_source_file,
         &passenger_conf->autogenerated.app_file_descriptor_ulimit_source_line);
 
@@ -363,10 +363,10 @@ passenger_conf_set_app_file_descriptor_ulimit(ngx_conf_t *cf, ngx_command_t *cmd
 
 static char *
 passenger_conf_set_max_instances_per_app(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-    passenger_loc_conf_t *passenger_conf = conf;
+    passenger_main_conf_t *passenger_conf = conf;
 
     passenger_conf->autogenerated.max_instances_per_app_explicitly_set = 1;
-    record_loc_conf_source_location(cf, passenger_conf,
+    record_main_conf_source_location(cf,
         &passenger_conf->autogenerated.max_instances_per_app_source_file,
         &passenger_conf->autogenerated.max_instances_per_app_source_line);
 

data/src/nginx_module/LocationConfig/AutoGeneratedCreateFunction.c

@@ -40,8 +40,6 @@
 
 static void
 passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *conf) {
-    conf->app_file_descriptor_ulimit = NGX_CONF_UNSET_UINT;
-    conf->max_instances_per_app = NGX_CONF_UNSET_UINT;
     conf->ruby.data = NULL;
     conf->ruby.len  = 0;
     conf->python.data = NULL;
@@ -97,14 +95,6 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->app_log_file.data = NULL;
     conf->app_log_file.len  = 0;
 
-    conf->app_file_descriptor_ulimit_source_file.data = NULL;
-    conf->app_file_descriptor_ulimit_source_file.len = 0;
-    conf->app_file_descriptor_ulimit_source_line = 0;
-    conf->app_file_descriptor_ulimit_explicitly_set = 0;
-    conf->max_instances_per_app_source_file.data = NULL;
-    conf->max_instances_per_app_source_file.len = 0;
-    conf->max_instances_per_app_source_line = 0;
-    conf->max_instances_per_app_explicitly_set = 0;
     conf->ruby_source_file.data = NULL;
     conf->ruby_source_file.len = 0;
     conf->ruby_source_line = 0;

data/src/nginx_module/LocationConfig/AutoGeneratedHeaderSerialization.c

@@ -49,26 +49,6 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
      * Calculate lengths
      */
 
-    if (conf->autogenerated.app_file_descriptor_ulimit != NGX_CONF_UNSET_UINT) {
-        end = ngx_snprintf(int_buf,
-            sizeof(int_buf) - 1,
-            "%ui",
-            conf->autogenerated.app_file_descriptor_ulimit);
-        len += sizeof("!~PASSENGER_APP_FILE_DESCRIPTOR_ULIMIT: ") - 1;
-        len += end - int_buf;
-        len += sizeof("\r\n") - 1;
-    }
-
-    if (conf->autogenerated.max_instances_per_app != NGX_CONF_UNSET_UINT) {
-        end = ngx_snprintf(int_buf,
-            sizeof(int_buf) - 1,
-            "%ui",
-            conf->autogenerated.max_instances_per_app);
-        len += sizeof("!~PASSENGER_MAX_PROCESSES: ") - 1;
-        len += end - int_buf;
-        len += sizeof("\r\n") - 1;
-    }
-
     if (conf->autogenerated.ruby.data != NULL) {
         len += sizeof("!~PASSENGER_RUBY: ") - 1;
         len += conf->autogenerated.ruby.len;
@@ -277,28 +257,6 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
         return 0;
     }
 
-    if (conf->autogenerated.app_file_descriptor_ulimit != NGX_CONF_UNSET_UINT) {
-        pos = ngx_copy(pos,
-            "!~PASSENGER_APP_FILE_DESCRIPTOR_ULIMIT: ",
-            sizeof("!~PASSENGER_APP_FILE_DESCRIPTOR_ULIMIT: ") - 1);
-        end = ngx_snprintf(int_buf,
-            sizeof(int_buf) - 1,
-            "%ui",
-            conf->autogenerated.app_file_descriptor_ulimit);
-        pos = ngx_copy(pos, int_buf, end - int_buf);
-        pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
-    }
-    if (conf->autogenerated.max_instances_per_app != NGX_CONF_UNSET_UINT) {
-        pos = ngx_copy(pos,
-            "!~PASSENGER_MAX_PROCESSES: ",
-            sizeof("!~PASSENGER_MAX_PROCESSES: ") - 1);
-        end = ngx_snprintf(int_buf,
-            sizeof(int_buf) - 1,
-            "%ui",
-            conf->autogenerated.max_instances_per_app);
-        pos = ngx_copy(pos, int_buf, end - int_buf);
-        pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
-    }
     if (conf->autogenerated.ruby.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_RUBY: ",

data/src/nginx_module/LocationConfig/AutoGeneratedMergeFunction.c

@@ -43,12 +43,6 @@
  */
 static int
 passenger_merge_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t *conf, passenger_autogenerated_loc_conf_t *prev, ngx_conf_t *cf) {
-    ngx_conf_merge_uint_value(conf->app_file_descriptor_ulimit,
-        prev->app_file_descriptor_ulimit,
-        NGX_CONF_UNSET_UINT);
-    ngx_conf_merge_uint_value(conf->max_instances_per_app,
-        prev->max_instances_per_app,
-        0);
     ngx_conf_merge_str_value(conf->ruby,
         prev->ruby,
         "ruby");

data/src/nginx_module/LocationConfig/AutoGeneratedStruct.h

@@ -40,7 +40,6 @@
 
 typedef struct {
     ngx_flag_t abort_websockets_on_process_shutdown;
-    ngx_uint_t app_file_descriptor_ulimit;
     ngx_array_t *base_uris;
     ngx_flag_t debugger;
     ngx_flag_t enabled;
@@ -51,7 +50,6 @@ typedef struct {
     ngx_uint_t headers_hash_max_size;
     ngx_array_t *headers_source;
     ngx_flag_t load_shell_envvars;
-    ngx_uint_t max_instances_per_app;
     ngx_int_t max_preloader_idle_time;
     ngx_uint_t max_request_queue_size;
     ngx_uint_t max_requests;
@@ -80,7 +78,6 @@ typedef struct {
     ngx_str_t vary_turbocache_by_cookie;
 
     ngx_str_t abort_websockets_on_process_shutdown_source_file;
-    ngx_str_t app_file_descriptor_ulimit_source_file;
     ngx_str_t app_group_name_source_file;
     ngx_str_t app_log_file_source_file;
     ngx_str_t app_rights_source_file;
@@ -99,7 +96,6 @@ typedef struct {
     ngx_str_t headers_hash_max_size_source_file;
     ngx_str_t headers_source_source_file;
     ngx_str_t load_shell_envvars_source_file;
-    ngx_str_t max_instances_per_app_source_file;
     ngx_str_t max_preloader_idle_time_source_file;
     ngx_str_t max_request_queue_size_source_file;
     ngx_str_t max_requests_source_file;
@@ -129,7 +125,6 @@ typedef struct {
     ngx_str_t vary_turbocache_by_cookie_source_file;
 
     ngx_uint_t abort_websockets_on_process_shutdown_source_line;
-    ngx_uint_t app_file_descriptor_ulimit_source_line;
     ngx_uint_t app_group_name_source_line;
     ngx_uint_t app_log_file_source_line;
     ngx_uint_t app_rights_source_line;
@@ -148,7 +143,6 @@ typedef struct {
     ngx_uint_t headers_hash_max_size_source_line;
     ngx_uint_t headers_source_source_line;
     ngx_uint_t load_shell_envvars_source_line;
-    ngx_uint_t max_instances_per_app_source_line;
     ngx_uint_t max_preloader_idle_time_source_line;
     ngx_uint_t max_request_queue_size_source_line;
     ngx_uint_t max_requests_source_line;
@@ -178,7 +172,6 @@ typedef struct {
     ngx_uint_t vary_turbocache_by_cookie_source_line;
 
     ngx_int_t abort_websockets_on_process_shutdown_explicitly_set;
-    ngx_int_t app_file_descriptor_ulimit_explicitly_set;
     ngx_int_t app_group_name_explicitly_set;
     ngx_int_t app_log_file_explicitly_set;
     ngx_int_t app_rights_explicitly_set;
@@ -197,7 +190,6 @@ typedef struct {
     ngx_int_t headers_hash_max_size_explicitly_set;
     ngx_int_t headers_source_explicitly_set;
     ngx_int_t load_shell_envvars_explicitly_set;
-    ngx_int_t max_instances_per_app_explicitly_set;
     ngx_int_t max_preloader_idle_time_explicitly_set;
     ngx_int_t max_request_queue_size_explicitly_set;
     ngx_int_t max_requests_explicitly_set;

data/src/nginx_module/MainConfig/AutoGeneratedCreateFunction.c

@@ -72,6 +72,8 @@ passenger_create_autogenerated_main_conf(passenger_autogenerated_main_conf_t *co
     conf->response_buffer_high_watermark = NGX_CONF_UNSET_UINT;
     conf->stat_throttle_rate = NGX_CONF_UNSET_UINT;
     conf->show_version_in_header = NGX_CONF_UNSET;
+    conf->app_file_descriptor_ulimit = NGX_CONF_UNSET_UINT;
+    conf->max_instances_per_app = NGX_CONF_UNSET_UINT;
     conf->admin_panel_url.data = NULL;
     conf->admin_panel_url.len  = 0;
     conf->admin_panel_auth_type.data = NULL;
@@ -173,6 +175,14 @@ passenger_create_autogenerated_main_conf(passenger_autogenerated_main_conf_t *co
     conf->show_version_in_header_source_file.len = 0;
     conf->show_version_in_header_source_line = 0;
     conf->show_version_in_header_explicitly_set = 0;
+    conf->app_file_descriptor_ulimit_source_file.data = NULL;
+    conf->app_file_descriptor_ulimit_source_file.len = 0;
+    conf->app_file_descriptor_ulimit_source_line = 0;
+    conf->app_file_descriptor_ulimit_explicitly_set = 0;
+    conf->max_instances_per_app_source_file.data = NULL;
+    conf->max_instances_per_app_source_file.len = 0;
+    conf->max_instances_per_app_source_line = 0;
+    conf->max_instances_per_app_explicitly_set = 0;
     conf->admin_panel_url_source_file.data = NULL;
     conf->admin_panel_url_source_file.len = 0;
     conf->admin_panel_url_source_line = 0;

data/src/nginx_module/MainConfig/AutoGeneratedManifestGeneration.c

@@ -306,6 +306,28 @@ generate_config_manifest_for_autogenerated_main_conf(manifest_gen_ctx_t *ctx, pa
         psg_json_value_set_bool(hierarchy_member, "value",
             conf->autogenerated.show_version_in_header);
     }
+    if (conf->autogenerated.app_file_descriptor_ulimit_explicitly_set) {
+        option_container = find_or_create_manifest_option_container(ctx,
+            ctx->global_config_container,
+            "passenger_app_file_descriptor_ulimit",
+            sizeof("passenger_app_file_descriptor_ulimit") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &conf->autogenerated.app_file_descriptor_ulimit_source_file,
+            conf->autogenerated.app_file_descriptor_ulimit_source_line);
+        psg_json_value_set_uint(hierarchy_member, "value",
+            conf->autogenerated.app_file_descriptor_ulimit);
+    }
+    if (conf->autogenerated.max_instances_per_app_explicitly_set) {
+        option_container = find_or_create_manifest_option_container(ctx,
+            ctx->global_config_container,
+            "passenger_max_instances_per_app",
+            sizeof("passenger_max_instances_per_app") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &conf->autogenerated.max_instances_per_app_source_file,
+            conf->autogenerated.max_instances_per_app_source_line);
+        psg_json_value_set_uint(hierarchy_member, "value",
+            conf->autogenerated.max_instances_per_app);
+    }
     if (conf->autogenerated.admin_panel_url_explicitly_set) {
         option_container = find_or_create_manifest_option_container(ctx,
             ctx->global_config_container,