appsignal 0.6.2 → 0.6.3.beta.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmJjMGRiZGFhZmQxMGU0N2MwMzkzNDQ1YmZhMjlkYzZkMDM0YmJjMA==
+    N2FjMjk1ZGYyZjkwNDI5NmZhNTkzMTVlMjBmZDViNjRlNTEwZTZhOA==
   data.tar.gz: !binary |-
-    YTJhNzg1NTBmMDA4ZDlhZDU3YTgzY2YzNzMxOGVmY2RlNjI5YmY0Yw==
+    ZDUxODgxMTg5ZjRiMWM2NzQwYzhiOTg5ZDQ3NjBiMGI1MzI0ZTY1Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWNiMDkyZjI0MGNmZDE0Njg4ZDdkMGVhZWUzYWU2OTdkNzg2NmY5MzgwODAy
-    NjMwOTNiMmQyZGI5NGI2NWIwNjllNWMzMTQ3OWRjNDRmMDgxYzRiMDcxMjI0
-    MTY4ZTY3MjNkMWUxOGU1MTFjYjNjN2YxMTg4Zjc0OWUxMmNlMzc=
+    MGNkYTExNDNkMDI4ZWM4M2JkNzVkYzVkNWQyYzA4NDc1NTI5Njk1NTAxNzk2
+    MmExY2IzNWJhMmUwOGI0YzE0OTNmZDgzNDlmZjI3MGE5ZjMwNzIyZjJkZDlm
+    MmU1MDc5YTRlMGQ4MTNhOGMyNWIzODNjMmY0ODg1NDJmMTExYzA=
   data.tar.gz: !binary |-
-    MTk2ZjVjNTIxYjlmMTIwNDVhNDEyMmZkMzE2YWY3ODE2NWM3NDFhY2VhMWVk
-    YzA0OTgyODVhNmU2ZWZiMWI4NDE5YWI5N2RlNDlmYWExMTkzZGNmMTY1MTk1
-    ZmNhOTAyMGJkYTJjOTcxMmU3ZTQ4YmU1MDhjNDA4Yjg4YTcwYzQ=
+    NzM4ZDAwMzRjNWM4Mjg4M2ZmOTQ2NzdmN2ZhMTlkOTkyNjE0MjViZjg5ZWU5
+    MTU5N2VkOGFiOTcwMDRhYmI4ZTI5ZmM5ODA1OWZmOWRiYjVmZjAzMmQ0ODlk
+    Zjk2YTYwNDlhN2VhMTQ4ZmYzZDVmZTRjN2QxOGJjYTBhM2RmMzA=

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 
 rvm:
+  - 1.8.7
   - 1.9.3
   - 2.0.0
   - jruby-19mode
@@ -13,6 +14,7 @@ gemfile:
 
 matrix:
   allow_failures:
+    - rvm: 1.8.7
     - rvm: jruby-19mode
 
 script: RAILS_ENV=test bundle exec rspec spec

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.6.3
+* Use a mutex around access to the aggregator
+
 # 0.6.2
 * Bugfix in backtrace cleaner usage for Rails 4
 

data/gemfiles/3.0.gemfile

@@ -1,5 +1,5 @@
 # encoding: utf-8
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'rails', '~> 3.0'
 gem 'rspec'

data/gemfiles/3.1.gemfile

@@ -1,5 +1,5 @@
 # encoding: utf-8
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'rails', '~> 3.1'
 gem 'rspec'

data/gemfiles/3.2.gemfile

@@ -1,5 +1,5 @@
 # encoding: utf-8
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'rails', '~> 3.2'
 gem 'rspec'

data/gemfiles/4.0.gemfile

@@ -1,5 +1,5 @@
 # encoding: utf-8
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'rails', '~> 4.0'
 gem 'rspec'

data/lib/appsignal/agent.rb

@@ -2,12 +2,13 @@ module Appsignal
   class Agent
     ACTION = 'log_entries'.freeze
 
-    attr_reader :aggregator, :thread, :active, :sleep_time, :transmitter
+    attr_reader :aggregator, :thread, :active, :sleep_time, :transmitter, :aggregator_semaphore
 
     def initialize
       return unless Appsignal.active?
       @sleep_time = 60.0
       @aggregator = Aggregator.new
+      @aggregator_semaphore = Mutex.new
       @retry_request = true
       @thread = Thread.new do
         while true do
@@ -25,15 +26,22 @@ module Appsignal
     end
 
     def enqueue(transaction)
-      aggregator.add(transaction)
+      aggregator_semaphore.synchronize do
+        aggregator.add(transaction)
+      end
     end
 
     def send_queue
       Appsignal.logger.debug("Sending queue")
-      current_aggregator = aggregator
-      @aggregator = Aggregator.new
+      aggregator_to_be_sent = nil
+      aggregator_semaphore.synchronize do
+        aggregator_to_be_sent = aggregator
+        @aggregator = Aggregator.new
+      end
       begin
-        handle_result transmitter.transmit(current_aggregator.post_processed_queue!)
+        handle_result(
+          transmitter.transmit(aggregator_to_be_sent.post_processed_queue!)
+        )
       rescue Exception => ex
         Appsignal.logger.error "#{ex.class} while sending queue: #{ex.message}"
         Appsignal.logger.error ex.backtrace.join('\n')

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.6.2'
+  VERSION = '0.6.3.beta.1'
 end

data/lib/generators/appsignal/appsignal_generator.rb

@@ -60,6 +60,6 @@ class AppsignalGenerator < Rails::Generators::Base
   def environments
     @environments ||= Dir.glob(
       File.join(%w(. config environments *.rb))
-    ).map { |o| File.basename(o, ".rb").to_sym } - EXCLUDED_ENVIRONMENTS
+    ).map { |o| File.basename(o, ".rb") } - EXCLUDED_ENVIRONMENTS
   end
 end

data/lib/generators/appsignal/templates/appsignal.yml

@@ -3,7 +3,7 @@
 # Active environments count towards the account plan limit.
 <%- environments.each do |environment| -%>
 <%= environment %>:
-  <%- if selected_environment.to_sym == environment -%>
+  <%- if selected_environment == environment -%>
   # The API key used by the AppSignal gem to push this specific environment to
   # AppSignal.  (required)
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3.beta.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-03 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -207,9 +207,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3