Merge pull request #286 from Draiken/sidekiq_app_type_overwritten

Ensure Sidekiq app_type is not overwritten when rails is a dependency
bugsnag · Apr 4, 2016 · b2f119d · b2f119d
2 parents b61c48c + 72389be
commit b2f119d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/bugsnag/railtie.rb b/lib/bugsnag/railtie.rb
@@ -7,6 +7,8 @@
 
 module Bugsnag
   class Railtie < Rails::Railtie
+    cattr_accessor :running_as_dependency
+
     rake_tasks do
       require "bugsnag/rake"
       load "bugsnag/tasks/bugsnag.rake"
@@ -49,7 +51,7 @@ class Railtie < Rails::Railtie
         ActiveRecord::Base.send(:include, Bugsnag::Rails::ActiveRecordRescue)
       end
 
-      Bugsnag.configuration.app_type = "rails"
+      Bugsnag.configuration.app_type = "rails" unless Bugsnag::Railtie.running_as_dependency
     end
 
     # Configure params_filters after initialization, so that rails initializers

diff --git a/lib/bugsnag/sidekiq.rb b/lib/bugsnag/sidekiq.rb
@@ -36,3 +36,7 @@ def call(worker, msg, queue)
 
 Bugsnag.configuration.internal_middleware.use(Bugsnag::Middleware::Sidekiq)
 Bugsnag.configuration.app_type = "sidekiq"
+
+if defined?(::Sidekiq::CLI) && defined?(Bugsnag::Railtie)
+  Bugsnag::Railtie.running_as_dependency = true
+end