Merge branch 'hotfix-1.0.1'

Gemfile

@@ -74,11 +74,6 @@ end
 # To use debugger
 # gem 'ruby-debug19', :require => 'ruby-debug'
 
-group :staging, :production do
-  gem 'exception_notification', :git => 'https://github.com/smartinez87/exception_notification.git'
-  gem 'slack-notifier', '~> 1.0'
-end
-
 gem 'rest-client', require: false
 
 group :development do

Gemfile.lock

@@ -6,14 +6,6 @@ GIT
       sidekiq (>= 2.6)
       thor
 
-GIT
-  remote: https://github.com/smartinez87/exception_notification.git
-  revision: f9dee5b5f6a1e1823bb274f719f1ae9c551e2f84
-  specs:
-    exception_notification (4.1.0.rc1)
-      actionmailer (>= 3.0.4)
-      activesupport (>= 3.0.4)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -64,9 +56,11 @@ GEM
       request_store
       user_agent_parser
       uuidtools
+    airbrussh (1.1.0)
+      sshkit (>= 1.6.1, != 1.7.0)
     annotate (2.5.0)
       rake
-    appsignal (1.0.3)
+    appsignal (1.3.3)
       rack
       thread_safe
     arel (3.0.3)
@@ -91,18 +85,21 @@ GEM
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
     cancan (1.6.10)
-    capistrano (3.4.0)
+    capistrano (3.6.1)
+      airbrussh (>= 1.0.0)
+      capistrano-harrow
       i18n
       rake (>= 10.0.0)
-      sshkit (~> 1.3)
+      sshkit (>= 1.9.0)
     capistrano-bundler (1.1.4)
       capistrano (~> 3.1)
       sshkit (~> 1.2)
+    capistrano-harrow (0.5.3)
     capistrano-maintenance (1.0.0)
       capistrano (>= 3.0)
     capistrano-passenger (0.2.0)
       capistrano (~> 3.0)
-    capistrano-rails (1.1.3)
+    capistrano-rails (1.1.7)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
     capistrano-rvm (0.1.2)
@@ -270,15 +267,15 @@ GEM
     method_source (0.8.1)
     mime-types (1.25.1)
     mini_portile2 (2.0.0)
-    multi_json (1.11.2)
+    multi_json (1.12.1)
     nested-hstore (0.0.5)
       activerecord
       activerecord-postgres-hstore
       activesupport
     nested_form (0.3.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.0.2)
+    net-ssh (3.2.0)
     netrc (0.11.0)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
@@ -397,7 +394,6 @@ GEM
       tilt (~> 1.3, >= 1.3.3)
     sitemap_generator (5.1.0)
       builder
-    slack-notifier (1.0.0)
     slackistrano (0.1.9)
       capistrano (>= 3.0.1)
       json
@@ -410,7 +406,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sshkit (1.8.1)
+    sshkit (1.11.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     strong_parameters (0.2.3)
@@ -496,7 +492,6 @@ DEPENDENCIES
   dotenv-rails
   ember-rails
   ember-source (= 1.1.2)
-  exception_notification!
   factory_girl_rails (~> 4.0)
   font-awesome-rails
   foreigner
@@ -545,7 +540,6 @@ DEPENDENCIES
   simplecov
   sinatra (>= 1.3.0)
   sitemap_generator
-  slack-notifier (~> 1.0)
   slackistrano
   slim
   strong_parameters

app/workers/download_worker.rb

@@ -33,11 +33,8 @@ def perform(download_id, params)
       @download.status = "completed"
 
       @download.save!
-    rescue => msg
-      ExceptionNotifier.notify_exception(msg) if defined? ExceptionNotifier
-      logger.warn "Failed: #{msg}"
-      logger.warn "### Backtrace ###"
-      logger.warn msg.backtrace
+    rescue => exception
+      Appsignal.add_exception(exception) if defined? Appsignal
       @download.status = "failed"
       @download.save!
     end

config/appsignal.yml

@@ -2,6 +2,8 @@ default: &defaults
   # Your push api key, it is possible to set this dynamically using ERB:
   # push_api_key: "<%= ENV['APPSIGNAL_PUSH_API_KEY'] %>"
   push_api_key: "<%= ENV['APPSIGNAL_PUSH_API_KEY'] %>"
+  ignore_exceptions:
+    - ActiveRecord::RecordNotFound
 
   # Your app's name
   name: "Species+"

config/deploy.rb

@@ -1,5 +1,5 @@
 # config valid only for current version of Capistrano
-lock '3.4.0'
+lock '3.6.1'
 
 set :application, 'sapi'
 set :repo_url, 'git@github.com:unepwcmc/SAPI.git'

config/initializers/ahoy.rb

@@ -1,7 +1,7 @@
 require 'sapi/geoip'
 class Ahoy::Store < Ahoy::Stores::ActiveRecordStore
-  def report_exception(e)
-    ExceptionNotifier.notify_exception(e) if defined? ExceptionNotifier
+  def report_exception(exception)
+    Appsignal.add_exception(exception) if defined? Appsignal
   end
 
   def visit_model

config/secrets.yml.example

@@ -21,5 +21,3 @@ staging:
 
 test:
   <<: *defaults
-
-slack_exception_notification_webhook_url:

config/secrets.yml.travis

@@ -21,5 +21,3 @@ staging:
 
 test:
   <<: *defaults
-
-slack_exception_notification_webhook_url: