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.

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

Only send JS errors+stats in production [no merge] #1987

Merged
merged 6 commits into from
Feb 20, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
* Added new public pages [#2034](https://github.com/CartoDB/cartodb/pull/2142)
* Added API keys and OAuth pages [#2142](https://github.com/CartoDB/cartodb/pull/2142)
* Replace 404 error page
* Only send JS errors+stats in production [#1987](https://github.com/CartoDB/cartodb/pull/1987)

Bugfixes:
* When being in any configuration page remove the arrow from the breadcrumb [#2312](https://github.com/CartoDB/cartodb/pull/2312)
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/application_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def insert_google_analytics(track, custom_vars = {})

def insert_trackjs
if not Cartodb.config[:trackjs].blank? and not Cartodb.config[:trackjs]['customer'].blank?
render(:partial => 'shared/trackjs', :locals => { customer: Cartodb.config[:trackjs]['customer'] })
render(:partial => 'shared/trackjs', :locals => { customer: Cartodb.config[:trackjs]['customer'], enabled: Cartodb.config[:trackjs]['enabled'] })
end
end

Expand Down
7 changes: 5 additions & 2 deletions app/views/shared/_trackjs.html.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<% unless customer.blank? || Rails.env.development? %>
<% unless customer.blank? %>
<script>
window._trackJs = { enabled: <%= enabled ? 'true' : 'false' %> };
</script>
<script type="text/javascript" src="//d2zah9y47r7bi2.cloudfront.net/releases/current/tracker.js" data-token="<%= customer %>"></script>
<% end %>
<% end %>
1 change: 1 addition & 0 deletions config/app_config.yml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ defaults: &defaults
tumblr:
api_key: ''
trackjs:
enabled: false
customer: ''
common_data:
protocol: 'https'
Expand Down
13 changes: 0 additions & 13 deletions lib/assets/javascripts/cartodb/new_common/track_js_errors.js

This file was deleted.

5 changes: 3 additions & 2 deletions lib/assets/javascripts/cartodb/new_dashboard/entry.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ var Router = require('new_dashboard/router');
var $ = require('jquery');
var cdb = require('cartodb.js');
var MainView = require('new_dashboard/main_view');
var trackJsErrors = require('new_common/track_js_errors');
var sendUsageToMixpanel = require('./send_usage_to_mixpanel');
var urls = require('new_common/urls_fn');

if (window.trackJs) {
trackJsErrors(window.trackJs, window.user_data.username);
window.trackJs.configure({
userId: window.user_data.username
});
}

/**
Expand Down
5 changes: 3 additions & 2 deletions lib/assets/javascripts/cartodb/new_keys/entry.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
var $ = require('jquery');
var cdb = require('cartodb.js');
var trackJsErrors = require('new_common/track_js_errors');
var HeaderView = require('new_common/views/dashboard_header_view');
var SupportView = require('new_common/support_view');
var HeaderViewModel = require('new_keys/header_view_model');
Expand All @@ -9,7 +8,9 @@ var urls = require('new_common/urls_fn');
var RegenerateKeysDialog = require('new_keys/regenerate_keys_dialog_view');

if (window.trackJs) {
trackJsErrors(window.trackJs, window.user_data.username);
window.trackJs.configure({
userId: window.user_data.username
});
}

/**
Expand Down
24 changes: 0 additions & 24 deletions lib/assets/test/spec/cartodb/new_common/track_js_errors.spec.js

This file was deleted.