union_station_hooks_core 2.0.4 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df35261b0e97879c7efaeace5392fed3d378dbf2
-  data.tar.gz: 6b58361269c0079bf4dc41c112af455e8b978745
+  metadata.gz: dfc9815e53e9b9fdd1ec5ec8406c75dbe63cfad1
+  data.tar.gz: 9ff6e5d34e4c703e4a1a3d98272dea5e49b07cfc
 SHA512:
-  metadata.gz: 8abba9d2d20485454a869230b2080af25333596e93a6e35bf98b06c42c30a00f5a3d49c41f40c33e1eb18c4781ee03324a44fabd5c7963402c09d41026399d2c
-  data.tar.gz: 637063a376809286d98950e33a399b173820a26cf49a3c997a02c749b531363c382e9f2245d87700b127eef4b85a573597ffb6125984b2184eeb011b6ab0c9ff
+  metadata.gz: 95656628e3239ee71c71b21bf5d093150934f68dcd3cee2642d224c90f1b670304248b173b9b1d60503cd5df6ea75316a7c6a36118ccdb18870aa3624f92050c
+  data.tar.gz: a3fa7113d2d569c3c1c3a23dcb1efd2853bfaee3434f116b3c128a9b8e143a7f667a6018d90cdd38bcd4fba685587f8f6a4c6f641a6a416e6b4337b3cc1bad52

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2015 Phusion Holding B.V.
+Copyright (c) 2010-2016 Phusion Holding B.V.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/union_station_hooks_core/api.rb

@@ -118,6 +118,34 @@ module UnionStationHooks
       end
     end
 
+    # Logs an exception that did NOT occur during a request.
+    #
+    # This method should be used for logging exceptions outside the
+    # request-response cycle, e.g. exceptions in threads. If you want to
+    # log a request that occurred during a request, use
+    # {RequestReporter#log_exception} instead. That method will also log
+    # any related request-specific information, while this method does not.
+    #
+    # @param [Exception] exception
+    # @since 2.1.0
+    def log_exception(exception)
+      transaction = context.new_transaction(app_group_name, :exceptions, key)
+      begin
+        return do_nothing_on_null(:log_exception) if transaction.null?
+
+        base64_message = exception.message
+        base64_message = exception.to_s if base64_message.empty?
+        base64_message = Utils.base64(base64_message)
+        base64_backtrace = Utils.base64(exception.backtrace.join("\n"))
+
+        transaction.message("Message: #{base64_message}")
+        transaction.message("Class: #{exception.class.name}")
+        transaction.message("Backtrace: #{base64_backtrace}")
+      ensure
+        transaction.close
+      end
+    end
+
     # Returns an opaque object (a {TimePoint}) that represents a collection
     # of metrics about the current time.
     #

data/lib/union_station_hooks_core/context.rb

@@ -59,10 +59,8 @@ module UnionStationHooks
       @server_address = ust_router_address
       @username = username
       @password = password
-      if node_name && !node_name.empty?
-        @node_name = node_name
-      else
-        @node_name = `hostname`.strip
+      if node_name && node_name.empty?
+        @node_name = nil
       end
 
       # This mutex protects the following instance variables, but
@@ -271,7 +269,11 @@ module UnionStationHooks
     end
 
     def handshake_initialization(channel)
-      channel.write('init', @node_name)
+      if @node_name
+        channel.write('init', @node_name)
+      else
+        channel.write('init')
+      end
       process_ust_router_reply(channel,
         'UstRouter client initialization error')
     end

data/lib/union_station_hooks_core/request_reporter/misc.rb

@@ -166,6 +166,10 @@ module UnionStationHooks
 
     # Logs an exception that occurred during a request.
     #
+    # If you want to use an exception that occurred outside the
+    # request/response cycle, e.g. an exception that occurred in a thread,
+    # use {UnionStationHooks.log_exception} instead.
+    #
     # If {#log_controller_action_block} or {#log_controller_action}
     # was called during the same request, then the information passed to
     # those methods will be included in the exception report.

data/lib/union_station_hooks_core/spec_helper.rb

@@ -220,6 +220,24 @@ module UnionStationHooks
       end
     end
 
+    # Assert that the dump file eventually exists and that its contents
+    # eventually match the given regex.
+    def eventually_expect_dump_file_to_match(regex, category = 'requests')
+      wait_for_dump_file_existance(category)
+      eventually do
+        read_dump_file(category) =~ regex
+      end
+    end
+
+    # Assert that the dump file (if it ever exists) its contents will never match
+    # the given regex.
+    def never_expect_dump_file_to_match(regex, category = 'requests')
+      should_never_happen do
+        File.exist?(dump_file_path(category)) &&
+          read_dump_file(category) =~ regex
+      end
+    end
+
     # Makes `UnionStationHooks::Log.warn` not print anything.
     def silence_warnings
       UnionStationHooks::Log.warn_callback = lambda { |_message| }

data/lib/union_station_hooks_core/transaction.rb

@@ -125,7 +125,7 @@ module UnionStationHooks
       log_activity_end(name, end_time, has_error)
     end
 
-    def close(should_flush_to_disk = false)
+    def close
       return if !@connection
 
       @connection.synchronize do
@@ -140,9 +140,6 @@ module UnionStationHooks
               Utils.encoded_timestamp, true)
             Utils.process_ust_router_reply(@connection.channel,
               "Error handling reply for 'closeTransaction' message")
-            if should_flush_to_disk
-              flush_to_disk
-            end
           end
         ensure
           @connection.unref
@@ -175,11 +172,5 @@ module UnionStationHooks
       @connection.disconnect
       raise e
     end
-
-    def flush_to_disk
-      @connection.channel.write('flush')
-      Utils.process_ust_router_reply(@connection.channel,
-        "Error handling reply for 'flush' message")
-    end
   end
 end

data/lib/union_station_hooks_core/version_data.rb

@@ -1,5 +1,5 @@
 #  Union Station - https://www.unionstationapp.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2016 Phusion Holding B.V.
 #
 #  "Union Station" and "Passenger" are trademarks of Phusion Holding B.V.
 #
@@ -38,7 +38,7 @@
 
 {
   :major  => 2,
-  :minor  => 0,
-  :tiny   => 4,
-  :string => '2.0.4'
+  :minor  => 1,
+  :tiny   => 1,
+  :string => '2.1.1'
 }

data/lib/union_station_hooks_core.rb

@@ -56,6 +56,7 @@ end
 #  * {UnionStationHooks.begin_rack_request} and
 #    {UnionStationHooks.end_rack_request}
 #  * {UnionStationHooks::RequestReporter}
+#  * {UnionStationHooks.log_exception}
 #
 # ## Rack example
 #
@@ -323,6 +324,12 @@ module UnionStationHooks
       nil
     end
 
+    def log_exception(_exception)
+      # When `initialize!` is called, the definition in
+      # `api.rb` will override this implementation.
+      nil
+    end
+
   private
 
     def finalize_and_validate_config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: union_station_hooks_core
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.1
 platform: ruby
 authors:
 - Hongli Lai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies: []
 description: Union Station Ruby hooks core code.
 email: info@phusion.nl
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Union Station Ruby hooks core code