Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Debugger::Railtie doesn't stop Rails from starting up #1411

Merged
merged 1 commit into from Apr 7, 2017
Merged

Debugger::Railtie doesn't stop Rails from starting up #1411

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 15 additions & 14 deletions google-cloud-debugger/lib/google/cloud/debugger/rails.rb
View file
Open in desktop
Expand Up @@ -58,19 +58,20 @@ class Railtie < ::Rails::Railtie
end

initializer "Stackdriver.Debugger" do |app|
debugger_config = Railtie.parse_rails_config config
if self.class.use_debugger? app.config
debugger_config = Railtie.parse_rails_config config

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view


project_id = debugger_config[:project_id]
keyfile = debugger_config[:keyfile]
module_name = debugger_config[:module_name]
module_version = debugger_config[:module_version]
project_id = debugger_config[:project_id]
keyfile = debugger_config[:keyfile]
module_name = debugger_config[:module_name]
module_version = debugger_config[:module_version]

debugger = Google::Cloud::Debugger.new project: project_id,
keyfile: keyfile,
module_name: module_name,
module_version: module_version
debugger =
Google::Cloud::Debugger.new project: project_id,
keyfile: keyfile,
module_name: module_name,
module_version: module_version

if self.class.use_debugger? app.config
app.middleware.insert_after Rack::ETag,
Google::Cloud::Debugger::Middleware,
debugger: debugger
Expand Down Expand Up @@ -102,16 +103,16 @@ def self.use_debugger? config
Google::Cloud::Debugger::Credentials.credentials_with_scope(
debugger_config[:keyfile])
rescue => e
Rails.log "Google::Cloud::Debugger is not activated due to " \
"authorization error: #{e.message}"
Rails.logger.warn "Google::Cloud::Debugger is not activated due " \
"to authorization error: #{e.message}"
return false
end

project_id = debugger_config[:project_id] ||
Google::Cloud::Debugger::Project.default_project
if project_id.to_s.empty?
Rails.log "Google::Cloud::Debugger is not activated due to empty " \
"project_id"
Rails.logger.warn "Google::Cloud::Debugger is not activated due " \
"to empty project_id"
return false
end

Expand Down