passenger 5.0.25 → 5.0.26

data/src/ruby_supportlib/phusion_passenger/standalone/config_options_list.rb

@@ -113,9 +113,8 @@ module PhusionPassenger
         :name      => :socket_backlog,
         :type      => :integer,
         :cli       => '--socket-backlog',
-        :default   => DEFAULT_SOCKET_BACKLOG,
         :desc      => "Override size of the socket backlog.\n" \
-                      "Default: %DEFAULT%"
+                      "Default: #{DEFAULT_SOCKET_BACKLOG}"
       },
       {
         :name      => :ssl,
@@ -175,6 +174,12 @@ module PhusionPassenger
         :name      => :data_buffer_dir,
         :type      => :path,
         :desc      => 'Use the given data buffer directory'
+      },
+      {
+        :name      => :core_file_descriptor_ulimit,
+        :type      => :integer,
+        :desc      => "Set custom file descriptor ulimit for the\n" \
+                      "#{SHORT_PROGRAM_NAME} core"
       }
     ]
 
@@ -278,6 +283,12 @@ module PhusionPassenger
         :desc      => "Load shell startup files before loading\n" \
                       'application'
       },
+      {
+        :name      => :app_file_descriptor_ulimit,
+        :type      => :integer,
+        :desc      => "Set custom file descriptor ulimit for the\n" \
+                      "application"
+      },
       {
         :name      => :debugger,
         :type      => :boolean,

data/src/ruby_supportlib/phusion_passenger/standalone/config_utils.rb

@@ -109,6 +109,7 @@ module PhusionPassenger
                 "(error in config option '#{key}': #{e.message})"
             end
           else
+            STDERR.puts "*** WARNING: #{filename}: configuration key '#{key}' is not supported"
             result[key] = val
           end
         end

data/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2015 Phusion Holding B.V.
+#  Copyright (c) 2014-2016 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -173,9 +173,14 @@ module PhusionPassenger
           add_param(command, :python, "--python")
           add_param(command, :nodejs, "--nodejs")
           add_param(command, :meteor_app_settings, "--meteor-app-settings")
+          add_param(command, :core_file_descriptor_ulimit, "--core-file-descriptor-ulimit")
+          add_param(command, :app_file_descriptor_ulimit, "--app-file-descriptor-ulimit")
 
           command << " #{Shellwords.escape(@apps[0][:root])}"
 
+          command << " --EC --BU"
+          add_param(command, :core_file_descriptor_ulimit, "--core-file-descriptor-ulimit")
+
           return {
             :identifier    => "#{AGENT_EXE} watchdog",
             :start_command => command,

data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core.rb

@@ -330,6 +330,12 @@ module UnionStationHooks
       nil
     end
 
+    def get_delta_monotonic
+      # When `initialize!` is called, the definition in
+      # `api.rb` will override this implementation.
+      nil
+    end
+
   private
 
     def finalize_and_validate_config

data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/api.rb

@@ -70,12 +70,10 @@ module UnionStationHooks
 
       # Workaround for Ruby < 2.1 support where there is no function for querying
       # the monotonic time.
-      delta_monotonic = rack_env['PASSENGER_DELTA_MONOTONIC']
-      if delta_monotonic
-        delta_monotonic = delta_monotonic.to_i
-      end
+      delta_monotonic_env = rack_env['PASSENGER_DELTA_MONOTONIC']
+      set_delta_monotonic(delta_monotonic_env.to_i) if delta_monotonic_env
 
-      reporter = RequestReporter.new(context, txn_id, app_group_name, key, delta_monotonic)
+      reporter = RequestReporter.new(context, txn_id, app_group_name, key)
       return if reporter.null?
 
       rack_env['union_station_hooks'] = reporter
@@ -149,14 +147,15 @@ module UnionStationHooks
     # Returns an opaque object (a {TimePoint}) that represents a collection
     # of metrics about the current time.
     #
-    # Various API methods expect you to provide timing information. They
-    # accept standard Ruby `Time` objects, but it is generally better to
-    # pass `TimePoint` objects. Unlike the standard Ruby `Time` object,
-    # which only contains the wall clock time (the real time), `TimePoint`
-    # may contain additional timing information such as CPU time, time
-    # spent in userspace and kernel space, time spent context switching,
-    # etc. The exact information contained in the object is operating
-    # system specific, hence why the object is meant to be opaque.
+    # This TimePoint samples monotonic time (with a fallback to wall clock
+    # time) as well as CPU time, time spent in userspace and kernel space,
+    # time spent context switching, etc. The exact information contained 
+    # in the object is operating system specific, hence the object is opaque.
+    #
+    # You should use it for the various API methods that require timing
+    # information. Those methods also accept standard Ruby `Time` objects, 
+    # but we strongly recommended against doing this, because wall clock
+    # time can jump forwards and backwards, which may create issues.
     #
     # See {RequestReporter#log_controller_action} for an example of
     # an API method which expects timing information.
@@ -165,19 +164,28 @@ module UnionStationHooks
     # information is supposed to be obtained by calling
     # `UnionStationHooks.now`.
     #
-    # In all API methods that expect a `TimePoint`, you can also pass a
-    # normal Ruby `Time` object instead. But if you do that, the logged
-    # timing information will be less detailed. Only do this if you cannot
-    # obtain a `TimePoint` object for some reason.
-    #
     # @return [TimePoint]
     def now
+      monotime_usec = Utils.monotime_usec_now
       pt = Utils.process_times
-      TimePoint.new(Time.now, pt.utime, pt.stime)
+      TimePoint.new(monotime_usec, pt.utime, pt.stime)
+    end
+
+    # Returns a best-estimate delta (usec) between the wallclock and 
+    # the monotonic clock (updated every request), such that: 
+    # time_monotic_usec = time_wallclock_usec - delta
+    def get_delta_monotonic
+      @mono_mutex.synchronize { @delta_monotonic }
     end
 
   private
 
+    # Although the de-facto state seems to be that reading/writing instance variables
+    # is MT-safe, it's not guaranteed so better safe than sorry here.
+    def set_delta_monotonic(val)
+      @mono_mutex.synchronize { @delta_monotonic = val }
+    end
+
     def create_context
       require_lib('context')
       @@context = Context.new(config[:ust_router_address],
@@ -222,6 +230,8 @@ module UnionStationHooks
         UnionStationHooks::Log.debugging = true
       end
       require_simple_json
+      @mono_mutex = Mutex.new
+      @delta_monotonic = 0
       @@initialized = true
     end
   end

data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/context.rb

@@ -173,7 +173,7 @@ module UnionStationHooks
       end
     end
 
-    def continue_transaction(txn_id, group_name, category, key, delta_monotonic = 0)
+    def continue_transaction(txn_id, group_name, category, key)
       if !@server_address
         return Transaction.new(nil, nil)
       elsif !txn_id || txn_id.empty?
@@ -209,7 +209,7 @@ module UnionStationHooks
               Utils.encoded_timestamp,
               key,
               true)
-            return Transaction.new(@connection, txn_id, delta_monotonic)
+            return Transaction.new(@connection, txn_id)
           rescue SystemCallError, IOError
             @connection.disconnect
             UnionStationHooks::Log.warn(

data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/request_reporter.rb

@@ -102,7 +102,7 @@ module UnionStationHooks
     # in the {RequestReporter class description}.
     #
     # @api private
-    def initialize(context, txn_id, app_group_name, key, delta_monotonic)
+    def initialize(context, txn_id, app_group_name, key)
       raise ArgumentError, 'Transaction ID must be given' if txn_id.nil?
       raise ArgumentError, 'App group name must be given' if app_group_name.nil?
       raise ArgumentError, 'Union Station key must be given' if key.nil?
@@ -110,7 +110,6 @@ module UnionStationHooks
       @txn_id = txn_id
       @app_group_name = app_group_name
       @key = key
-      @delta_monotonic = delta_monotonic
       @transaction = continue_transaction
       @next_view_rendering_number = 1
       @next_user_activity_number = 1
@@ -139,7 +138,7 @@ module UnionStationHooks
 
     def continue_transaction
       @context.continue_transaction(@txn_id, @app_group_name,
-        :requests, @key, @delta_monotonic)
+        :requests, @key)
     end
 
     # Called when one of the methods return early upon detecting null

data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/simple_json.rb

@@ -29,6 +29,8 @@ require 'strscan'
 require 'forwardable'
 
 module UnionStationHooks
+
+# @private
 module SimpleJSON
 
 # Usage:
@@ -38,7 +40,6 @@ module SimpleJSON
 #
 # Run tests by executing this file directly. Pipe standard input to the script to have it
 # parsed as JSON and to display the result in Ruby.
-#
 class JSON
   def self.parse(data) new(data).parse end
 

data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/spec_helper.rb

@@ -116,6 +116,8 @@ module UnionStationHooks
 
     def initialize_ush_api
       UnionStationHooks.require_lib('api')
+      UnionStationHooks.instance_variable_set(:@mono_mutex, Mutex.new)
+      UnionStationHooks.instance_variable_set(:@delta_monotonic, 0)
     end
 
     def initialize_debugging

data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/time_point.rb

@@ -26,28 +26,14 @@ module UnionStationHooks
   # See {UnionStationHooks.now} for more information.
   class TimePoint
     # @api private
-    attr_reader :time, :utime, :stime
+    attr_reader :monotime, :utime, :stime
 
     # @api private
-    def initialize(time, utime, stime)
-      @time = time
+    def initialize(monotime, utime, stime)
+      @monotime = monotime
       @utime = utime
       @stime = stime
     end
 
-    # @api private
-    def usec_timestamp
-      @time.to_i * 1_000_000 + @time.usec
-    end
-
-    # @api private
-    def usec
-      @time.usec
-    end
-
-    # @api private
-    def to_i
-      @time.to_i
-    end
   end
 end

data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/transaction.rb

@@ -31,10 +31,9 @@ module UnionStationHooks
   class Transaction
     attr_reader :txn_id
 
-    def initialize(connection, txn_id, delta_monotonic = 0)
+    def initialize(connection, txn_id)
       @connection = connection
       @txn_id = txn_id
-      @delta_monotonic = delta_monotonic
       if connection
         raise ArgumentError, 'Transaction ID required' if txn_id.nil?
         connection.ref
@@ -84,37 +83,35 @@ module UnionStationHooks
     end
 
     def log_activity_begin(name, time = UnionStationHooks.now, extra_info = nil)
-      monotime = Utils.encoded_monotime_now(@delta_monotonic)
       if extra_info
         extra_info_base64 = Utils.base64(extra_info)
       else
         extra_info_base64 = nil
       end
       if time.is_a?(TimePoint)
-        message "BEGIN: #{name} (#{monotime}," \
+        message "BEGIN: #{name} (#{time.monotime.to_s(36)}," \
           "#{time.utime.to_s(36)},#{time.stime.to_s(36)}) " \
           "#{extra_info_base64}"
       else
-        message "BEGIN: #{name} (#{monotime})" \
+        message "BEGIN: #{name} (#{Utils.monotime_usec_from_time(time).to_s(36)})" \
           " #{extra_info_base64}"
       end
     end
 
     def log_activity_end(name, time = UnionStationHooks.now, has_error = false)
-      monotime = Utils.encoded_monotime_now(@delta_monotonic)
       if time.is_a?(TimePoint)
         if has_error
-          message "FAIL: #{name} (#{monotime}," \
+          message "FAIL: #{name} (#{time.monotime.to_s(36)}," \
             "#{time.utime.to_s(36)},#{time.stime.to_s(36)})"
         else
-          message "END: #{name} (#{monotime}," \
+          message "END: #{name} (#{time.monotime.to_s(36)}," \
             "#{time.utime.to_s(36)},#{time.stime.to_s(36)})"
         end
       else
         if has_error
-          message "FAIL: #{name} (#{monotime})"
+          message "FAIL: #{name} (#{Utils.monotime_usec_from_time(time).to_s(36)})"
         else
-          message "END: #{name} (#{monotime})"
+          message "END: #{name} (#{Utils.monotime_usec_from_time(time).to_s(36)})"
         end
       end
     end

data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/utils.rb

@@ -90,20 +90,22 @@ module UnionStationHooks
     end
 
     if Process.const_defined?(:CLOCK_MONOTONIC)
-      def encoded_monotime_now(delta_monotonic)
-        time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-        timestamp = (time * 1_000_000).to_i
-        timestamp.to_s(36)
+      def monotime_usec_now
+        Process.clock_gettime(Process::CLOCK_MONOTONIC, :microsecond)
       end
     else
-      def encoded_monotime_now(delta_monotonic)
-        time = Time.now
-        timestamp = time.to_i * 1_000_000 + time.usec - delta_monotonic
-        timestamp.to_s(36)
+      # Workaround for approximating the monotonic clock
+      def monotime_usec_now
+        monotime_usec_from_time
       end
     end
 
-    def encoded_timestamp(time = Time.now)
+    def monotime_usec_from_time(time = Time.now)
+      timestamp = time.to_i * 1_000_000 + time.usec - UnionStationHooks.get_delta_monotonic
+    end
+
+    def encoded_timestamp
+      time = Time.now
       timestamp = time.to_i * 1_000_000 + time.usec
       timestamp.to_s(36)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.0.25
+  version: 5.0.26
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -276,6 +276,7 @@ files:
 - src/README.md
 - src/agent/AgentMain.cpp
 - src/agent/Core/ApiServer.h
+- src/agent/Core/ApplicationPool/AbstractSession.h
 - src/agent/Core/ApplicationPool/BasicGroupInfo.h
 - src/agent/Core/ApplicationPool/BasicProcessInfo.h
 - src/agent/Core/ApplicationPool/Common.h
@@ -306,6 +307,7 @@ files:
 - src/agent/Core/ApplicationPool/Process.h
 - src/agent/Core/ApplicationPool/Session.h
 - src/agent/Core/ApplicationPool/Socket.h
+- src/agent/Core/ApplicationPool/TestSession.h
 - src/agent/Core/Controller.h
 - src/agent/Core/Controller/AppResponse.h
 - src/agent/Core/Controller/BufferBody.cpp
@@ -386,6 +388,7 @@ files:
 - src/apache2_module/SetHeaders.cpp
 - src/apache2_module/SetHeaders.cpp.erb
 - src/apache2_module/mod_passenger.c
+- src/cxx_supportlib/Algorithms/MovingAverage.h
 - src/cxx_supportlib/AppTypes.cpp
 - src/cxx_supportlib/AppTypes.h
 - src/cxx_supportlib/BackgroundEventLoop.cpp