union_station_hooks_core 2.0.1 → 2.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjg3MGI3ZWUzZTk0NDRmMWQyMTI5ZDJiY2JiN2U1NDk0ZjFiYTRjZA==
+    OTQ0Y2Q0ZTkxYjEyNWViMDZmMWVkYjAwOGM4MjcyYTU1M2E0MzgxMA==
   data.tar.gz: !binary |-
-    ZDExODg5NjdjYWVlYjNiYmYyY2ZiNTlmYTZlNGQyOTgyMTEzMTMyOQ==
+    NTU2YzRiYmZlZmM3ZmIwMDNmMjA2YjUwZDY1NmJlOGIyNjM2NmJkOQ==
 SHA512:
   metadata.gz: !binary |-
-    NzRlYTIyZDc5ZTE5Zjc1ODZkNzg3YjhjMmM1MTJmZjk4OWMwZWUwMzNiOTVl
-    NDViNDM2ZjFmMTdjZTk5MjkzNzg0NjliM2U4MTBmOWQ1Nzg5OGE2ZDRlOTUz
-    YWI0NTIzNjI5NjZlYjBkMTE2NGJiYjFiZDAyMzk3MzU4MGEzOWE=
+    MWFmMjUwYTg2OGVjYjMxNmZkMGUzYWM4YTMyZjcyYmVmYmM4NzcyZGVhODkz
+    YzhiNGJhZWI2YjI0MGYxYzc2NWFhYTYzZDVjZDY4MGNmNWU4ZTc4MWY3ZTQ0
+    MWQ2MDZkMTRkNDJlNzg2YTJkMzMwMjRhNzg1NzZlMjZkMDM5ODM=
   data.tar.gz: !binary |-
-    ZjEyNWM2MGVjNjg5Zjk3OGYxOWIzZTQ4NjJjMDY2ODY3NGI5N2JiYmMxNWZl
-    ZDM3MjdhMGVhZWY5NzU4MjQ5NzY0ZjA0MWQzNWVlZjEwNTNlNTk4ZWRlNDky
-    Y2Q5NWQ2ZTgzYTcyOTZmNzgxZjI1ZTQyNmE3ZmRhYjM5YWNhN2M=
+    Y2Y2MDFiNTY0ZWViZGRlMDA3YzQ0MGE1ZWZmZTlmZDc3MGRiMGQ4MTk4Y2My
+    MWY0NTY0NGI5ZmYwYWFkN2ZlYThhOTAyMmZkOTJjYTgyYWM2MmU3MWM4NjUy
+    N2M1Y2UxZWFhNzM0ZWI4OTRlMGMwZmNhMGNlYTQ4MGNlNDA1OWE=

data/README.md

@@ -28,7 +28,7 @@ If your application is a Rails application, then you should use the [union_stati
 
 ### Using with Passenger
 
-**Note: This documentation section only applies to Passenger X.X.X or later!**
+**Note: This documentation section only applies to Passenger 5.0.20 or later!**
 
 If you use [Passenger](https://www.phusionpassenger.com/), then you do not need to install the `union_station_hooks_core` gem. `union_station_hooks_core` is bundled with Passenger.
 
@@ -100,11 +100,11 @@ Please refer to [the API documentation website](http://www.rubydoc.info/github/p
 
 ## Legacy code
 
-Before Passenger X.X.X, the Union Station setup instructions used to tell you to create a `config/initializers/passenger.rb` in which you call the following code:
+Before Passenger 5.0.20, the Union Station setup instructions used to tell you to create a `config/initializers/passenger.rb` in which you call the following code:
 
     PhusionPassenger.install_framework_extensions! if defined?(PhusionPassenger)
 
-Since Passenger X.X.X, `PhusionPassenger.install_framework_extensions!` has become an alias for `UnionStationHooks.initialize!`, but the former is considered deprecated. Please replace the above code with:
+Since Passenger 5.0.20, `PhusionPassenger.install_framework_extensions!` has become an alias for `UnionStationHooks.initialize!`, but the former is considered deprecated. Please replace the above code with:
 
     if defined?(UnionStationHooks)
       UnionStationHooks.initialize!

data/lib/union_station_hooks_core.rb

@@ -42,7 +42,7 @@ end
 
 # The UnionStationHooks module is the entry point to the
 # `union_station_hooks_core` gem's public API. Note that this API is only
-# available since Passenger X.X.X!
+# available since Passenger 5.0.20!
 #
 # **_Not familiar with `union_station_hooks_core`? Please read the
 # [README](https://github.com/phusion/union_station_hooks_core)
@@ -81,6 +81,7 @@ end
 #       # object, you can log to Union Station information about the current
 #       # request.
 #       reporter = env['union_station_hooks']
+#       # -OR- (if you don't have access to the Rack env):
 #       reporter = Thread.current[:union_station_hooks]
 #
 #       # The reporter object may be nil because of various error conditions,

data/lib/union_station_hooks_core/request_reporter/basics.rb

@@ -145,11 +145,12 @@ module UnionStationHooks
     # This is automatically called by Passenger's Rack handler.
     #
     # @private
-    # @return An ID to be passed later to {#log_writing_rack_body_end}.
+    # @return An ID to be passed later to {#log_writing_rack_body_end}, or nil
+    #   on error.
     def log_writing_rack_body_begin
       return do_nothing_on_null(:log_writing_rack_body_begin) if null?
       @transaction.log_activity_begin('app writing out response body')
-      nil
+      :writing_rack_body # Random non-nil ID
     end
 
     # Logs that the application server is done writing out the Rack
@@ -162,8 +163,8 @@ module UnionStationHooks
     # @private
     def log_writing_rack_body_end(id)
       return do_nothing_on_null(:log_writing_rack_body_end) if null?
+      return if id.nil?
       @transaction.log_activity_end('app writing out response body')
-      nil
     end
 
     # Logs that the application server is about to call `#close` on the
@@ -175,11 +176,12 @@ module UnionStationHooks
     # This is automatically called by Passenger's Rack handler.
     #
     # @private
-    # @return An ID to be passed later to {#log_closing_rack_body_end}.
+    # @return An ID to be passed later to {#log_closing_rack_body_end}, or nil
+    #   on error.
     def log_closing_rack_body_begin
       return do_nothing_on_null(:log_closing_rack_body_begin) if null?
       @transaction.log_activity_begin('closing rack body object')
-      nil
+      :closing_rack_body # Random non-nil ID
     end
 
     # Logs that the application server is done calling `#close` on the
@@ -190,6 +192,7 @@ module UnionStationHooks
     # @private
     def log_closing_rack_body_end(id)
       return do_nothing_on_null(:log_closing_rack_body_end) if null?
+      return if id.nil?
       @transaction.log_activity_end('closing rack body object')
     end
   end

data/lib/union_station_hooks_core/version_data.rb

@@ -39,6 +39,6 @@
 {
   :major  => 2,
   :minor  => 0,
-  :tiny   => 1,
-  :string => '2.0.1'
+  :tiny   => 2,
+  :string => '2.0.2'
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: union_station_hooks_core
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Hongli Lai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies: []
 description: Union Station Ruby hooks core code.
 email: info@phusion.nl