rollbar 0.12.11 → 0.12.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 224237219a5e86bf176e6b7bb6752e7afd93e4b2
-  data.tar.gz: 178f549cc06d75334172dceedecc3ba98e47c68e
+  metadata.gz: d15606de22469d888a7845fe9de075e8436cb3b1
+  data.tar.gz: a19b11e9376b8ca3a32f9c5e0a0892fe78b35752
 SHA512:
-  metadata.gz: f71e6ece9ee2010b4b176757ba096652606ff415457a6c5304379a4c8c8af96d484da3662a0c73ebd4c3930c75c2478c3a8a52101984566a02f8061e689d0906
-  data.tar.gz: 761e80838ce6cbd442ea66eae9fb69bb3426f71194cb7003761587cd6a1f400c318fab09e47f203678c4c4b7d1d7b38f56e7b02e7aa39eb14b13435468e76942
+  metadata.gz: 92e66df6defcf5e9cc8a529969072b66820c43ba1eeab67a083075caa17163f65710b5646d3506af45c7e87627fcbf5ec1813bc8063d0da10b03621b8e1a5e82
+  data.tar.gz: a7de71a752d7239bb02fa0a7cf5fb0acc1a2535b29d939a4a36123d96557bfd3d232f328fbbedf13154071b97fe466e1b580ce92a514bc3f017bcd4d9073471d

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+**0.12.12**
+- Changes to support Engine Yard add-on setup
+
 **0.12.11**
 - Raise payload size limit to 128k
 

data/lib/generators/rollbar/rollbar_generator.rb

@@ -16,16 +16,25 @@ module Rollbar
           exit
         end
 
-        if access_token === :use_env_sentinel
-          say "Generator run without an access token; assuming you want to configure using an environment variable."
-          say "You'll need to add an environment variable ROLLBAR_ACCESS_TOKEN with your access token:"
-          say "\n$ export ROLLBAR_ACCESS_TOKEN=yourtokenhere"
-          say "\nIf that's not what you wanted to do:"
-          say "\n$ rm config/initializers/rollbar.rb"
-          say "$ rails generate rollbar yourtokenhere"
-          say "\n"
+        begin
+          require 'ey_config'
+        rescue LoadError
+        end
+        
+        if defined? EY::Config
+            say "Access token will be read from Engine Yard configuration"
         else
-          say "access token: " << access_token
+          if access_token === :use_env_sentinel
+            say "Generator run without an access token; assuming you want to configure using an environment variable."
+            say "You'll need to add an environment variable ROLLBAR_ACCESS_TOKEN with your access token:"
+            say "\n$ export ROLLBAR_ACCESS_TOKEN=yourtokenhere"
+            say "\nIf that's not what you wanted to do:"
+            say "\n$ rm config/initializers/rollbar.rb"
+            say "$ rails generate rollbar yourtokenhere"
+            say "\n"
+          else
+            say "access token: " << access_token
+          end
         end
 
         template 'initializer.rb', 'config/initializers/rollbar.rb',

data/lib/generators/rollbar/templates/initializer.rb

@@ -1,13 +1,22 @@
 require 'rollbar/rails'
 Rollbar.configure do |config|
-  config.access_token = <%= access_token_expr %>
-
   # Without configuration, Rollbar is enabled in all environments.
   # To disable in specific environments, set config.enabled=false.
+  <% if (defined? EY::Config) %>
+  # Here we'll disable in 'test' and 'development':
+  if Rails.env.test? or Rails.env.development?
+    config.enabled = false
+  else
+    config.access_token = EY::Config.get('rollbar', 'ROLLBAR_ACCESS_TOKEN')
+  end
+  <% else %>
+  config.access_token = <%= access_token_expr %>
+
   # Here we'll disable in 'test':
   if Rails.env.test?
     config.enabled = false
   end
+  <% end %>
 
   # By default, Rollbar will try to call the `current_user` controller method
   # to fetch the logged-in user object, and then call that object's `id`,

data/lib/rollbar.rb

@@ -19,7 +19,7 @@ require 'rollbar/util'
 require 'rollbar/railtie' if defined?(Rails)
 
 module Rollbar
-  MAX_PAYLOAD_SIZE = 128 * 1024 #128kb
+  MAX_PAYLOAD_SIZE = 32 * 1024 #128kb
   
   class << self
     attr_writer :configuration
@@ -360,7 +360,8 @@ module Rollbar
       result = MultiJson.dump(payload)
       
       # Try to truncate strings in the payload a few times if the payload is too big
-      if result.bytesize > MAX_PAYLOAD_SIZE
+      original_size = result.bytesize
+      if original_size > MAX_PAYLOAD_SIZE
         thresholds = [1024, 512, 256]
         thresholds.each_with_index do |threshold, i|
           new_payload = payload.clone
@@ -372,7 +373,8 @@ module Rollbar
           if result.bytesize <= MAX_PAYLOAD_SIZE
             break
           elsif i == thresholds.length - 1
-            send_failsafe('Could not send payload due to it being too large after truncating attempts', nil)
+            final_size = result.bytesize
+            send_failsafe("Could not send payload due to it being too large after truncating attempts. Original size: #{original_size} Final size: #{final_size}", nil)
             log_error "[Rollbar] Payload too large to be sent: #{MultiJson.dump(payload)}"
             return
           end
@@ -546,6 +548,8 @@ module Rollbar
       truncator = Proc.new do |value|
         if value.is_a?(String) and value.bytesize > byte_threshold
           Rollbar::Util::truncate(value, byte_threshold)
+        elsif value.is_a?(Array) and value.length > byte_threshold
+          Rollbar::Util::truncate(value, byte_threshold)
         else
           value
         end

data/lib/rollbar/util.rb

@@ -32,4 +32,4 @@ module Rollbar
       str.unpack("U*").slice(0, length - ellipsis.length).pack("U*") + ellipsis
     end
   end
-end
+end

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "0.12.11"
+  VERSION = "0.12.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 0.12.11
+  version: 0.12.12
 platform: ruby
 authors:
 - Brian Rue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json