ENV enablement key now takes precedence over local flag. No longer ra…

…ising an exception on no auth key.
callstacking · May 16, 2023 · 34cc772 · 34cc772
1 parent 0a948eb
commit 34cc772
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/.idea/checkpoint-rails.iml b/.idea/checkpoint-rails.iml
diff --git a/lib/callstacking/rails/engine.rb b/lib/callstacking/rails/engine.rb
@@ -45,7 +45,6 @@ class Engine < ::Rails::Engine
         @@loader.instrument_existing
 
         loader.on_load
-        # loader.reset!
       end
 
       # Serialize all tracing requests for now.

diff --git a/lib/callstacking/rails/settings.rb b/lib/callstacking/rails/settings.rb
@@ -23,9 +23,7 @@ def url
       end
 
       def auth_token
-        x = ENV['CALLSTACKING_API_TOKEN'] || settings[:auth_token]
-        raise "No auth token found. #{ENV['CALLSTACKING_API_TOKEN']} Please run `callstacking login` to get one." if x.nil?
-        x
+        ENV['CALLSTACKING_API_TOKEN'] || settings[:auth_token]
       end
 
       def auth_token?
@@ -52,8 +50,8 @@ def disable!
       end
 
       def enabled?
-        return Thread.current[CACHE_KEY] if Thread.current[CACHE_KEY].present?
         return ActiveRecord::Type::Boolean.new.cast(ENV[ENV_KEY]) if ENV[ENV_KEY].present?
+        return Thread.current[CACHE_KEY] if Thread.current[CACHE_KEY].present?
         false
       end