Merge branch 'master' into features/extract_issue_tracker

Conflicts: Gemfile.lock

Merge branch 'master' into features/extract_issue_tracker
Conflicts: Gemfile.lock
Stephen Crosby
2 parents ccadc6a2 759a2c9a
Showing 28 changed files with 312 additions and 137 deletions Show diff stats
.travis.yml
CONTRIBUTORS.md
Gemfile
Gemfile.lock
README.md
app/controllers/api/v1/problems_controller.rb
app/mailers/mailer.rb
app/models/error_report.rb
app/models/notification_service.rb
app/models/notification_services/campfire_service.rb
app/models/notification_services/gtalk_service.rb
app/models/notification_services/hoiio_service.rb
app/models/notification_services/pushover_service.rb
app/models/problem.rb
app/views/apps/show.html.haml
app/views/problems/_search.html.haml
app/views/problems/index.html.haml
config/cloud/cloud66/files/_load_config.rb
config/initializers/_load_config.rb
config/initializers/mongo.rb
@@ -4,13 +4,14 @@ env:
 rvm:
   - 2.0.0
   - 1.9.3
-  - rbx-19mode
+  - 2.1.2
+  - rbx-2
   - ruby-head
 services: mongodb
 #script: ./script/rspec-queue-mongoid.rb --format progress spec
 matrix:
   allow_failures:
-    - rvm: rbx-19mode
+    - rvm: rbx-2
     - rvm: ruby-head
@@ -42,11 +42,14 @@
 - [@nashby][]
 - [@shingara][]
 - [@tscolari][]
+- [@callumd][]
+
 [@anicet]: https://github.com/anicet
 [@nashby]: https://github.com/nashby
 [@shingara]: https://github.com/shingara
 [@tscolari]: https://github.com/tscolari
+[@callumd]: https://github.com/callumd
 ## 0.2.0 - 2013-09-11
 source 'https://rubygems.org'
-RAILS_VERSION = '~> 3.2.18'
+RAILS_VERSION = '~> 3.2.19'
 gem 'actionmailer', RAILS_VERSION
 gem 'actionpack', RAILS_VERSION
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.18)
-      actionpack (= 3.2.18)
+    actionmailer (3.2.19)
+      actionpack (= 3.2.19)
       mail (~> 2.5.4)
     actionmailer_inline_css (1.5.3)
       actionmailer (>= 3.0.0)
       nokogiri (>= 1.4.4)
       premailer (>= 1.7.1)
-    actionpack (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
+    actionpack (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -18,18 +18,18 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.18)
-      activesupport (= 3.2.18)
+    activemodel (3.2.19)
+      activesupport (= 3.2.19)
       builder (~> 3.0.0)
-    activerecord (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
+    activerecord (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
-    activesupport (3.2.18)
+    activeresource (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
+    activesupport (3.2.19)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.6)
@@ -177,7 +177,7 @@ GEM
     kgio (2.8.1)
     launchy (2.3.0)
       addressable (~> 2.3)
-    libv8 (3.16.14.3)
+    libv8 (3.16.14.7)
     libxml-ruby (2.7.0)
     lighthouse-api (2.0)
       activeresource (>= 3.0.0)
@@ -260,7 +260,7 @@ GEM
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    polyglot (0.3.4)
+    polyglot (0.3.5)
     premailer (1.7.3)
       css_parser (>= 1.1.9)
       htmlentities (>= 4.0.0)
@@ -284,25 +284,25 @@ GEM
     rack-ssl-enforcer (0.2.6)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.18)
-      actionmailer (= 3.2.18)
-      actionpack (= 3.2.18)
-      activerecord (= 3.2.18)
-      activeresource (= 3.2.18)
-      activesupport (= 3.2.18)
+    rails (3.2.19)
+      actionmailer (= 3.2.19)
+      actionpack (= 3.2.19)
+      activerecord (= 3.2.19)
+      activeresource (= 3.2.19)
+      activesupport (= 3.2.19)
       bundler (~> 1.0)
-      railties (= 3.2.18)
+      railties (= 3.2.19)
     rails_autolink (1.1.4)
       rails (> 3.1)
-    railties (3.2.18)
-      actionpack (= 3.2.18)
-      activesupport (= 3.2.18)
+    railties (3.2.19)
+      actionpack (= 3.2.19)
+      activesupport (= 3.2.19)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     raindrops (0.12.0)
-    rake (10.3.1)
+    rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
     ref (1.0.5)
@@ -352,7 +352,7 @@ GEM
       railties (~> 3.0)
     term-ansicolor (1.2.2)
       tins (~> 0.8)
-    therubyracer (0.12.0)
+    therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
@@ -367,7 +367,7 @@ GEM
     turbo-sprockets-rails3 (0.3.10)
       railties (> 3.2.8, < 4.0.0)
       sprockets (>= 2.0.0)
-    tzinfo (0.3.39)
+    tzinfo (0.3.41)
     uglifier (2.2.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -392,9 +392,9 @@ PLATFORMS
   ruby
 DEPENDENCIES
-  actionmailer (~> 3.2.18)
+  actionmailer (~> 3.2.19)
   actionmailer_inline_css
-  actionpack (~> 3.2.18)
+  actionpack (~> 3.2.19)
   airbrake
   better_errors
   binding_of_caller
@@ -443,7 +443,7 @@ DEPENDENCIES
   rack-ssl
   rack-ssl-enforcer
   rails_autolink
-  railties (~> 3.2.18)
+  railties (~> 3.2.19)
   ri_cal
   rspec-rails
   rushover
@@ -78,25 +78,20 @@ There is a demo available at [http://errbit-demo.herokuapp.com/](http://errbit-d
 Email: demo@errbit-demo.herokuapp.com<br/>
 Password: password
-# Requirement
+# Requirements
-The list of requirement to install Errbit is :
+The list of requirements to install Errbit are :
  * Ruby 1.9.3 or higher
  * MongoDB 2.2.0 or higher
-By default it's the Ruby 2.0.0 to use. But you can define your own ruby
-version with RUBY_VERSION variable between :
-
- * 1.9.3
- * 2.0.0
- * 2.1.0
+Errbit uses Ruby 2.0.0 as a default. However, it is compatible with Ruby 1.9.3 and above.
 Installation
 ------------
 *Note*: This app is intended for people with experience deploying and maintaining
-Rails applications. If you're uncomfortable with any step below then Errbit is not
+Rails applications. If you're uncomfortable with any steps below then Errbit is not
 for you.
 **Set up your local box or server(Ubuntu):**
@@ -108,10 +103,10 @@ apt-get update
 apt-get install mongodb-10gen
 ```
-  * Install libxml and libcurl
+  * Install libxml, libzip, libssl and libcurl
 ```bash
-apt-get install libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev
+apt-get install libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libzip-dev libssl-dev
 ```
   * Install Bundler
@@ -179,9 +174,6 @@ heroku config:add HEROKU=true
 heroku config:add SECRET_TOKEN="$(bundle exec rake secret)"
 heroku config:add ERRBIT_HOST=some-hostname.example.com
 heroku config:add ERRBIT_EMAIL_FROM=example@example.com
-# This next line is required to access env variables during asset compilation.
-# For more info, go to this link: https://devcenter.heroku.com/articles/labs-user-env-compile
-heroku labs:enable user-env-compile
 git push heroku master
 ```
@@ -360,17 +352,16 @@ rake db:migrate
 rake assets:precompile
 ```
-If we change the way that data is stored, this will run any migrations to bring your database up to date.
+This will ensure that your application stays up to date with any schema changes.
-### Upgrade from errbit 0.2 to 0.3
+### Upgrading errbit from version 0.2 to 0.3
-The file of MongoDB connection config/mongoid.yml change between 0.2 to
-0.3. So Check the new config/mongoid.yml.example file and update it in
-good way.
+The MongoDB connection file `config/mongoid.yml` has changed between version 0.2 and
+0.3. We have provided a new example configuration file to use at `config/mongoid.example.yml`.
-This change is not need to be done if you use only ENV variable to
-define you access to MongoDB database.
+This change is not needed if you use ENV variables to
+define access to your MongoDB database.
 ## User information in error reports
@@ -379,11 +370,12 @@ Errbit can now display information about the user who experienced an error.
 This gives you the ability to ask the user for more information,
 and let them know when you've fixed the bug.
-If you would like to include information about the current user in your error reports,
-you can replace the `airbrake` gem in your Gemfile with `airbrake_user_attributes`,
-which wraps the `airbrake` gem and injects user information.
-It will inject information about the current user into the error report
-if your Rails app's controller responds to a `#current_user` method.
+If you are running a Rails application and would like to include information
+about the current user in your error reports, you can replace the `airbrake`
+gem in your Gemfile with `airbrake_user_attributes`.
+This gem is a wrapper around the `airbrake` gem and will automatically
+inject information about the user into any error reports,
+so long as your controllers respond to a `#current_user` method.
 The user's attributes are filtered to remove authentication fields.
 If user information is received with an error report,
@@ -394,26 +386,33 @@ it will be displayed under the *User Details* tab:
 (This tab will be hidden if no user information is available.)
-Adding javascript errors notifications
+Javascript error notifications
 --------------------------------------
-Errbit easily supports javascript errors notifications. You just need to add `config.js_notifier = true` to the errbit initializer in the rails app.
+You can log javascript errors that occur in your application by following the directions below.
+
+# Rails Applications
+
+Add the following line to the `<head>` section of your application template.
+
+```
+<%= airbrake_javascript_notifier %>
+```
+
+# Other Platforms
+
+include the following before any javascript is loaded in your application.
 ```
-Errbit.configure do |config|
-  config.host    = 'YOUR-ERRBIT-HOST'
-  config.api_key = 'YOUR-PROJECT-API-KEY'
-  config.js_notifier = true
-end
+<script src='http://YOUR-ERRBIT-HOST/javascripts/notifier.js' type='text/javascript'></script>
 ```
-Then get the `notifier.js` from `errbit/public/javascript/notifier.js` and add to `application.js` on your rails app or include `http://YOUR-ERRBIT-HOST/javascripts/notifier.js` on your `application.html.erb.`
 Using custom fingerprinting methods
 -----------------------------------
-Errbit now allows you to easily use your own Fingerprint Strategy if that's what you'd like to do. If you are upgrading from a very old version of errbit, you can use the `LegacyFingerprint` to provide yourself
-with compatibility. The fingerprint strategy can be changed by adding an initializer to errbit:
+Errbit allows you to use your own Fingerprinting Strategy.
+If you are upgrading from a very old version of errbit, you can use the `LegacyFingerprint` for compatibility. The fingerprint strategy can be changed by adding an initializer to errbit:
 ```ruby
 # config/fingerprint.rb
@@ -533,23 +532,18 @@ Solutions known to work are listed below:
 <table>
   <tr>
     <th>PHP (&gt;= 5.3)</th>
-    <td>https://github.com/flippa/errbit-php</td>
+    <td>[flippa/errbit-php](https://github.com/flippa/errbit-php)</td>
   </tr>
   <tr>
     <th>OOP PHP (&gt;= 5.3)</th>
-    <td>https://github.com/emgiezet/errbitPHP</td>
+    <td>[emgiezet/errbitPHP](https://github.com/emgiezet/errbitPHP)</td>
   </tr>
   <tr>
     <th>Python</th>
-    <td>https://github.com/mkorenkov/errbit.py , https://github.com/pulseenergy/airbrakepy</td>
+    <td>[mkorenkov/errbit.py](https://github.com/mkorenkov/errbit.py) , [pulseenergy/airbrakepy](https://github.com/pulseenergy/airbrakepy)</td>
   </tr>
 </table>
-Develop on Errbit
------------------
-
-A guide can help on this way on  [**Errbit Advanced Developer Guide**](docs/DEVELOPER-ADVANCED.md)
-
 ## Other documentation
 * [All ENV variables availables to configure Errbit](docs/ENV-VARIABLES.md)
@@ -582,7 +576,7 @@ Special Thanks
 See the [contributors graph](https://github.com/errbit/errbit/graphs/contributors) for further details. You can see another list of Contributors by release version on [CONTRIBUTORS.md]
-Contributing
+Contributing to Errbit
 ------------
 We welcome any contributions. If you need to tweak Errbit for your organization's needs,
@@ -604,9 +598,13 @@ and make **optional** features configurable via `config/config.yml`.
 * Send us a pull request. Bonus points for topic branches.
 * Add you on the CONTRIBUTORS.md file on the current release
+# Running tests
+
+More information can be found in the  [**Errbit Advanced Developer Guide**](docs/DEVELOPER-ADVANCED.md)
+
 Copyright
 ---------
-Copyright (c) 2010-2013 Errbit Team. See LICENSE for details.
+Copyright (c) 2010-2014 Errbit Team. See LICENSE for details.
 class Api::V1::ProblemsController < ApplicationController
   respond_to :json, :xml
+  FIELDS = %w{app_id app_name environment message where first_notice_at last_notice_at resolved resolved_at notices_count}
+
+  def show
+    result = benchmark("[api/v1/problems_controller/show] query time") do
+      begin
+        Problem.only(FIELDS).find(params[:id])
+      rescue Mongoid::Errors::DocumentNotFound
+        head :not_found
+        return false
+      end
+    end
+
+    respond_to do |format|
+      format.any(:html, :json) { render :json => result } # render JSON if no extension specified on path
+      format.xml  { render :xml  => result }
+    end
+  end
   def index
     query = {}
-    fields = %w{app_id app_name environment message where first_notice_at last_notice_at resolved resolved_at notices_count}
     if params.key?(:start_date) && params.key?(:end_date)
       start_date = Time.parse(params[:start_date]).utc
@@ -11,8 +27,8 @@ class Api::V1::ProblemsController &lt; ApplicationController
       query = {:first_notice_at=>{"$lte"=>end_date}, "$or"=>[{:resolved_at=>nil}, {:resolved_at=>{"$gte"=>start_date}}]}
     end
-    results = benchmark("[api/v1/problems_controller] query time") do
-      Problem.where(query).with(:consistency => :strong).only(fields).to_a
+    results = benchmark("[api/v1/problems_controller/index] query time") do
+      Problem.where(query).with(:consistency => :strong).only(FIELDS).to_a
     end
     respond_to do |format|
@@ -6,7 +6,12 @@ class Mailer &lt; ActionMailer::Base
   helper ApplicationHelper
   helper BacktraceLineHelper
-  default :from => Errbit::Config.email_from
+  default :from => Errbit::Config.email_from,
+          'X-Errbit-Host' => Errbit::Config.host,
+          'X-Mailer' => 'Errbit',
+          'X-Auto-Response-Suppress' => 'OOF, AutoReply',
+          'Precedence' => 'bulk',
+          'Auto-Submitted' => 'auto-generated'
   def err_notification(notice)
     @notice   = notice
@@ -15,6 +20,10 @@ class Mailer &lt; ActionMailer::Base
     count = @notice.similar_count
     count = count > 1 ? "(#{count}) " : ""
+    errbit_headers 'App' => @app.name,
+                   'Environment' => @notice.environment_name,
+                   'Error-Id' => @notice.err_id
+
     mail :to      => @app.notification_recipients,
          :subject => "#{count}[#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"
   end
@@ -23,6 +32,11 @@ class Mailer &lt; ActionMailer::Base
     @deploy   = deploy
     @app  = deploy.app
+    errbit_headers 'App' => @app.name,
+                   'Environment' => @deploy.environment,
+                   'Deploy-Revision' => @deploy.revision,
+                   'Deploy-User' => @deploy.username
+
     mail :to       => @app.notification_recipients,
          :subject  => "[#{@app.name}] Deployed to #{@deploy.environment} by #{@deploy.username}"
   end
@@ -36,7 +50,18 @@ class Mailer &lt; ActionMailer::Base
     recipients = @comment.notification_recipients
+    errbit_headers 'App' => @app.name,
+                   'Environment' => @notice.environment_name,
+                   'Problem-Id' => @problem.id,
+                   'Comment-Author' => @user.name
+
     mail :to      => recipients,
          :subject => "#{@user.name} commented on [#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"
   end
+
+  private
+
+  def errbit_headers(header)
+    header.each { |key,value| headers["X-Errbit-#{key}"] = value.to_s }
+  end
 end
@@ -15,15 +15,18 @@ require &#39;hoptoad_notifier&#39;
 # * <tt>:notifier</tt> - information to identify the source of the error report
 #
 class ErrorReport
-  attr_reader :error_class, :message, :request, :server_environment, :api_key, :notifier, :user_attributes, :framework
+  attr_reader :error_class, :message, :request, :server_environment, :api_key,
+              :notifier, :user_attributes, :framework, :notice
   cattr_accessor :fingerprint_strategy do
     Fingerprint
   end
   def initialize(xml_or_attributes)
-    @attributes = (xml_or_attributes.is_a?(String) ? Hoptoad.parse_xml!(xml_or_attributes) : xml_or_attributes).with_indifferent_access
-    @attributes.each{|k, v| instance_variable_set(:"@#{k}", v) }
+    @attributes = xml_or_attributes
+    @attributes = Hoptoad.parse_xml!(@attributes) if @attributes.is_a? String
+    @attributes = @attributes.with_indifferent_access
+    @attributes.each { |k, v| instance_variable_set(:"@#{k}", v) }
   end
   def rails_env
@@ -33,30 +36,29 @@ class ErrorReport
   end
   def app
-    @app ||= App.where(:api_key => api_key).first
+    @app ||= App.where(api_key: api_key).first
   end
   def backtrace
-    @normalized_backtrace ||= Backtrace.find_or_create(:raw => @backtrace)
+    @normalized_backtrace ||= Backtrace.find_or_create(raw: @backtrace)
   end
   def generate_notice!
     return unless valid?
     return @notice if @notice
     @notice = Notice.new(
-      :message => message,
-      :error_class => error_class,
-      :backtrace_id => backtrace.id,
-      :request => request,
-      :server_environment => server_environment,
-      :notifier => notifier,
-      :user_attributes => user_attributes,
-      :framework => framework
+      message: message,
+      error_class: error_class,
+      backtrace_id: backtrace.id,
+      request: request,
+      server_environment: server_environment,
+      notifier: notifier,
+      user_attributes: user_attributes,
+      framework: framework
     )
     error.notices << @notice
     @notice
   end
-  attr_reader :notice
   ##
   # Error associate to this error_report
@@ -66,23 +68,22 @@ class ErrorReport
   # @return [ Error ]
   def error
     @error ||= app.find_or_create_err!(
-      :error_class => error_class,
-      :environment => rails_env,
-      :fingerprint => fingerprint
+      error_class: error_class,
+      environment: rails_env,
+      fingerprint: fingerprint
     )
   end
   def valid?
-    !!app
+    app.present?
   end
   def should_keep?
     app_version = server_environment['app-version'] || ''
-    if self.app.current_app_version.present? && ( app_version.length <= 0 || Gem::Version.new(app_version) < Gem::Version.new(self.app.current_app_version) )
-      false
-    else
-      true
-    end
+    current_version = app.current_app_version
+    return true unless current_version.present?
+    return false if app_version.length <= 0
+    Gem::Version.new(app_version) >= Gem::Version.new(current_version)
   end
   private
@@ -90,5 +91,4 @@ class ErrorReport
   def fingerprint
     @fingerprint ||= fingerprint_strategy.generate(notice, api_key)
   end
-
 end
@@ -54,6 +54,6 @@ class NotificationService
   end
   def problem_url(problem)
-    "http://#{Errbit::Config.host}/apps/#{problem.app.id}/problems/#{problem.id}"
+    "#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id}/problems/#{problem.id}"
   end
 end
@@ -30,7 +30,7 @@ if defined? Campy
       # build the campfire client
       campy = Campy::Room.new(:account => subdomain, :token => api_token, :room_id => room_id)
       # post the issue to the campfire room
-      campy.speak "[errbit] #{problem.app.name} #{notification_description problem} - http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}/problems/#{problem.id.to_s}"
+      campy.speak "[errbit] #{problem.app.name} #{notification_description problem} - #{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}/problems/#{problem.id.to_s}"
     end
   end
 end
@@ -47,7 +47,7 @@ class NotificationServices::GtalkService &lt; NotificationService
     #has to look like this to be formatted properly in the client
     message =  """#{problem.app.name.to_s}
-http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
+#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
 #{notification_description problem}"""
     # post the issue to the xmpp room(s)
@@ -35,7 +35,7 @@ class NotificationServices::HoiioService &lt; NotificationService
     # send sms
     room_id.split(',').each do |number|
-      sms.send :dest => number, :msg => "http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s} #{notification_description problem}"
+      sms.send :dest => number, :msg => "#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s} #{notification_description problem}"
     end
   end
@@ -26,7 +26,7 @@ class NotificationServices::PushoverService &lt; NotificationService
     notification = Rushover::Client.new(subdomain)
     # send push notification to pushover
-    notification.notify(api_token, "#{notification_description problem}", :priority => 1, :title => "Errbit Notification", :url => "http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}", :url_title => "Link to error")
+    notification.notify(api_token, "#{notification_description problem}", :priority => 1, :title => "Errbit Notification", :url => "#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}", :url_title => "Link to error")
   end
 end
@@ -50,7 +50,6 @@ class Problem
   validates_presence_of :last_notice_at, :first_notice_at
-
   def self.all_else_unresolved(fetch_all)
     if fetch_all
       all
@@ -88,8 +88,7 @@
 - if app.problems.any?
   %h3.clear=t('.errors')
   %section
-    = form_tag search_problems_path(:all_errs => all_errs, :app_id => app.id), :method => :get, :remote => true do
-      = text_field_tag :search, params[:search], :placeholder => t('.search_placeholder')
+    = render 'problems/search', :all_errs => @all_errs, :app_id => app.id
   %br
   %section
     .problem_table{:id => 'problem_table'}
@@ -0,0 +1,2 @@
+= form_tag search_problems_path(:all_errs => all_errs, :app_id => app_id), :method => :get, :remote => true do
+    = text_field_tag :search, params[:search], :placeholder => t('.search_placeholder')
@@ -9,8 +9,7 @@
     = link_to 'show resolved', problems_path(:all_errs => true), :class => 'button'
 %section
-  = form_tag search_problems_path(:all_errs => @all_errs), :method => :get, :remote => true do
-    = text_field_tag :search, params[:search], :placeholder => 'Search for issues'
+  = render 'problems/search', :all_errs => @all_errs, :app_id => nil
 %br
 %section
   #problem_table.problem_table
@@ -17,6 +17,7 @@ unless defined?(Errbit::Config)
     Errbit::Config.use_gravatar = ENV['ERRBIT_USE_GRAVATAR']
     Errbit::Config.gravatar_default = ENV['ERRBIT_GRAVATAR_DEFAULT']
+    Errbit::Config.github_url = ENV['GITHUB_URL']
     Errbit::Config.github_authentication = ENV['GITHUB_AUTHENTICATION']
     Errbit::Config.github_client_id = ENV['GITHUB_CLIENT_ID']
     Errbit::Config.github_secret = ENV['GITHUB_SECRET']
@@ -6,9 +6,12 @@ unless defined?(Errbit::Config)
   Errbit::Config = OpenStruct.new
   use_env = ENV['HEROKU'] || ENV['USE_ENV']
+  Errbit::Config.protocol = 'http'
+
   # If Errbit is running on Heroku, config can be set from environment variables.
   if use_env
     Errbit::Config.host = ENV['ERRBIT_HOST']
+    Errbit::Config.protocol = ENV['ERRBIT_PROTOCOL'] || 'http'
     Errbit::Config.port = ENV['ERRBIT_PORT']
     Errbit::Config.email_from = ENV['ERRBIT_EMAIL_FROM']
     #  Not really easy to use like an env because need an array and ENV return a string :(
@@ -34,7 +37,8 @@ unless defined?(Errbit::Config)
       :authentication => :plain,
       :user_name      => ENV['SMTP_USERNAME']   || ENV['SENDGRID_USERNAME'],
       :password       => ENV['SMTP_PASSWORD']   || ENV['SENDGRID_PASSWORD'],
-      :domain         => ENV['SMTP_DOMAIN'] || ENV['SENDGRID_DOMAIN'] || ENV['ERRBIT_EMAIL_FROM'].split('@').last
+      :domain         => ENV['SMTP_DOMAIN'] || ENV['SENDGRID_DOMAIN'] ||
+                           (ENV['ERRBIT_EMAIL_FROM'] ? ENV['ERRBIT_EMAIL_FROM'].split('@').last : nil)
     }
   end
@@ -6,7 +6,7 @@ if config_file.file? &amp;&amp;
 elsif ENV['HEROKU'] || ENV['USE_ENV']
   # No mongoid.yml file. Use ENV variable to define your MongoDB
   # configuration
-  if mongo = ENV['MONGOLAB_URI'] || ENV['MONGOHQ_URL'] || ENV['MONGODB_URL']
+  if mongo = ENV['MONGOLAB_URI'] || ENV['MONGOHQ_URL'] || ENV['MONGODB_URL'] || ENV['MONGO_URL']
     settings = URI.parse(mongo)
     database_name = settings.path.gsub(/^\//, '')
   else
@@ -77,6 +77,8 @@ en:
       merge: "Merge select issues? They can be unmerged later."
       unmerge: "Unmerge selected issues? They can be re-merged later."
       unresolve: "Unresolve selected issues? They can be resolved again later."
+    search:
+      search_placeholder: 'Search for issues'
   comments:
     confirm_delete: "Permanently delete this comment?"
@@ -118,7 +120,6 @@ en:
       no_watcher: "Sadly, no one is watching this app"
       repository: Repository
       revision: Revision
-      search_placeholder: 'Search for issues'
       show_hide: "(show/hide)"
       unresolved_errs: unresolved errs
       unwatch: unwatch
@@ -50,7 +50,7 @@ Errbit::Application.routes.draw do
   namespace :api do
     namespace :v1 do
-      resources :problems, :only => [:index], :defaults => { :format => 'json' }
+      resources :problems, :only => [:index, :show], :defaults => { :format => 'json' }
       resources :notices,  :only => [:index], :defaults => { :format => 'json' }
       resources :stats, :only => [], :defaults => { :format => 'json' } do
         collection do
 # See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
-#
-# To ban all spiders from the entire site uncomment the next two lines:
-# User-Agent: *
-# Disallow: /
+User-Agent: *
+Disallow: /
@@ -7,6 +7,70 @@ describe Api::V1::ProblemsController do
       @user = Fabricate(:user)
     end
+    describe "GET /api/v1/problems/:id" do
+      before do
+        notice = Fabricate(:notice)
+        err = Fabricate(:err, :notices => [notice])
+        @problem = Fabricate(:problem, :errs => [err])
+      end
+
+      it "should return JSON if JSON is requested" do
+        get :show, :auth_token => @user.authentication_token, :format => "json", :id => Problem.first.id
+        expect { JSON.load(response.body) }.not_to raise_error() #JSON::ParserError
+      end
+
+      it "should return XML if XML is requested" do
+        get :index, :auth_token => @user.authentication_token, :format => "xml", :id => @problem.id
+        expect(Nokogiri::XML(response.body).errors).to be_empty
+      end
+
+      it "should return JSON by default" do
+        get :show, :auth_token => @user.authentication_token, :id => @problem.id
+        expect { JSON.load(response.body) }.not_to raise_error()#JSON::ParserError)
+      end
+
+      it "should return the correct problem" do
+        get :show, :auth_token => @user.authentication_token, :format => "json", :id => @problem.id
+
+        returned_problem = JSON.parse(response.body)
+        expect( returned_problem["_id"] ).to eq(@problem.id.to_s)
+      end
+
+      it "should return only the correct fields" do
+        get :show, :auth_token => @user.authentication_token, :format => "json", :id => @problem.id
+        returned_problem = JSON.parse(response.body)
+
+        expect( returned_problem.keys ).to match_array([
+          "app_name",
+          "first_notice_at",
+          "error_class",
+          "messages",
+          "hosts",
+          "created_at",
+          "app_id",
+          "last_notice_at",
+          "_id",
+          "issue_link",
+          "resolved",
+          "updated_at",
+          "resolved_at",
+          "last_deploy_at",
+          "where",
+          "issue_type",
+          "notices_count",
+          "user_agents",
+          "comments_count",
+          "message",
+          "environment"
+        ])
+      end
+
+      it "returns a 404 if the problem cannot be found" do
+        get :show, :auth_token => @user.authentication_token, :format => "json", :id => 'IdontExist'
+        expect( response.status ).to eq(404)
+      end
+    end
+
     describe "GET /api/v1/problems" do
       before do
         Fabricate(:problem, :first_notice_at => Date.new(2012, 8, 01), :resolved_at => Date.new(2012, 8, 02))
@@ -124,6 +124,31 @@ describe ProblemsController do
     end
   end
+  describe "GET /problems/search" do
+    before do
+      sign_in Fabricate(:admin)
+      @app      = Fabricate(:app)
+      @problem1 = Fabricate(:problem, :app=>@app, message: "Most important")
+      @problem2 = Fabricate(:problem, :app=>@app, message: "Very very important")
+    end
+
+    it "renders successfully" do
+      get :search
+      expect(response).to be_success
+    end
+
+    it "renders index template" do
+      get :search
+      expect(response).to render_template('problems/index')
+    end
+
+    it "searches problems for given string" do
+      get :search, :search => "Most important"
+      expect(controller.problems).to include(@problem1)
+      expect(controller.problems).to_not include(@problem2)
+    end
+  end
+
   describe "GET /apps/:app_id/problems/:id" do
     #render_views
 require 'spec_helper'
+shared_examples "a notification email" do
+  it "should have X-Mailer header" do
+    expect(@email).to have_header('X-Mailer', 'Errbit')
+  end
+
+  it "should have X-Errbit-Host header" do
+    expect(@email).to have_header('X-Errbit-Host', Errbit::Config.host)
+  end
+
+  it "should have Precedence header" do
+    expect(@email).to have_header('Precedence', 'bulk')
+  end
+
+  it "should have Auto-Submitted header" do
+    expect(@email).to have_header('Auto-Submitted', 'auto-generated')
+  end
+
+  it "should have X-Auto-Response-Suppress header" do
+    # http://msdn.microsoft.com/en-us/library/ee219609(v=EXCHG.80).aspx
+    expect(@email).to have_header('X-Auto-Response-Suppress', 'OOF, AutoReply')
+  end
+
+  it "should send the email" do
+    expect(ActionMailer::Base.deliveries.size).to eq 1
+  end
+end
+
 describe Mailer do
   context "Err Notification" do
     include EmailSpec::Helpers
@@ -19,9 +46,8 @@ describe Mailer do
       @email = Mailer.err_notification(notice).deliver
     end
-    it "should send the email" do
-      expect(ActionMailer::Base.deliveries.size).to eq 1
-    end
+    it_should_behave_like "a notification email"
+
     it "should html-escape the notice's message for the html part" do
       expect(@email).to have_body_text("class &lt; ActionController::Base")
@@ -62,10 +88,6 @@ describe Mailer do
       @email = Mailer.comment_notification(comment).deliver
     end
-    it "should send the email" do
-      expect(ActionMailer::Base.deliveries.size).to eq 1
-    end
-
     it "should be sent to comment notification recipients" do
       expect(@email.to).to eq recipients
     end
@@ -17,7 +17,7 @@ describe NotificationService::GtalkService do
     expect(gtalk).to receive(:connect).with(notification_service.service)
     expect(gtalk).to receive(:auth).with(notification_service.api_token)
     message_value = """#{problem.app.name.to_s}
-http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
+#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
 #{notification_service.notification_description problem}"""
     expect(Jabber::Message).to receive(:new).with(notification_service.user_id, message_value).and_return(message)
@@ -39,7 +39,7 @@ http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
       @notification_service = Fabricate :gtalk_notification_service, :app => @notice.app
       @problem = @notice.problem
       @error_msg = """#{@problem.app.name.to_s}
-http://#{Errbit::Config.host}/apps/#{@problem.app.id.to_s}
+#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{@problem.app.id.to_s}
 #{@notification_service.notification_description @problem}"""
       # gtalk stubbing
@@ -105,7 +105,7 @@ http://#{Errbit::Config.host}/apps/#{@problem.app.id.to_s}
     expect(gtalk).to receive(:connect)
     expect(gtalk).to receive(:auth).with(notification_service.api_token)
     message_value = """#{problem.app.name.to_s}
-http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
+#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
 #{notification_service.notification_description problem}"""
     expect(Jabber::Message).to receive(:new).with(notification_service.room_id, message_value).and_return(message)
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe NotificationService do
+
+  let(:notice) { Fabricate :notice }
+  let(:notification_service) { Fabricate :notification_service, :app => notice.app }
+  let(:problem) { notice.problem }
+
+  it "it should use http by default in #problem_url" do
+    notification_service.problem_url(problem).should start_with 'http://'
+  end
+
+  it "it should use the protocol value specified in the config in #problem_url" do
+    Errbit::Config.protocol = 'https'
+    notification_service.problem_url(problem).should start_with 'https://'
+  end
+
+end
	@@ -4,13 +4,14 @@ env:		@@ -4,13 +4,14 @@ env:
4	rvm:	4	rvm:
5	- 2.0.0	5	- 2.0.0
6	- 1.9.3	6	- 1.9.3
7	- - rbx-19mode	7	+ - 2.1.2
		8	+ - rbx-2
8	- ruby-head	9	- ruby-head
9	services: mongodb	10	services: mongodb
10	#script: ./script/rspec-queue-mongoid.rb --format progress spec	11	#script: ./script/rspec-queue-mongoid.rb --format progress spec
11	matrix:	12	matrix:
12	allow_failures:	13	allow_failures:
13	- - rvm: rbx-19mode	14	+ - rvm: rbx-2
14	- rvm: ruby-head	15	- rvm: ruby-head
15		16
16		17
1	source 'https://rubygems.org'	1	source 'https://rubygems.org'
2		2
3	-RAILS_VERSION = '~> 3.2.18'	3	+RAILS_VERSION = '~> 3.2.19'
4		4
5	gem 'actionmailer', RAILS_VERSION	5	gem 'actionmailer', RAILS_VERSION
6	gem 'actionpack', RAILS_VERSION	6	gem 'actionpack', RAILS_VERSION
1	GEM	1	GEM
2	remote: https://rubygems.org/	2	remote: https://rubygems.org/
3	specs:	3	specs:
4	- actionmailer (3.2.18)
5	- actionpack (= 3.2.18)	4	+ actionmailer (3.2.19)
		5	+ actionpack (= 3.2.19)
6	mail (~> 2.5.4)	6	mail (~> 2.5.4)
7	actionmailer_inline_css (1.5.3)	7	actionmailer_inline_css (1.5.3)
8	actionmailer (>= 3.0.0)	8	actionmailer (>= 3.0.0)
9	nokogiri (>= 1.4.4)	9	nokogiri (>= 1.4.4)
10	premailer (>= 1.7.1)	10	premailer (>= 1.7.1)
11	- actionpack (3.2.18)
12	- activemodel (= 3.2.18)
13	- activesupport (= 3.2.18)	11	+ actionpack (3.2.19)
		12	+ activemodel (= 3.2.19)
		13	+ activesupport (= 3.2.19)
14	builder (~> 3.0.0)	14	builder (~> 3.0.0)
15	erubis (~> 2.7.0)	15	erubis (~> 2.7.0)
16	journey (~> 1.0.4)	16	journey (~> 1.0.4)
	@@ -18,18 +18,18 @@ GEM		@@ -18,18 +18,18 @@ GEM
18	rack-cache (~> 1.2)	18	rack-cache (~> 1.2)
19	rack-test (~> 0.6.1)	19	rack-test (~> 0.6.1)
20	sprockets (~> 2.2.1)	20	sprockets (~> 2.2.1)
21	- activemodel (3.2.18)
22	- activesupport (= 3.2.18)	21	+ activemodel (3.2.19)
		22	+ activesupport (= 3.2.19)
23	builder (~> 3.0.0)	23	builder (~> 3.0.0)
24	- activerecord (3.2.18)
25	- activemodel (= 3.2.18)
26	- activesupport (= 3.2.18)	24	+ activerecord (3.2.19)
		25	+ activemodel (= 3.2.19)
		26	+ activesupport (= 3.2.19)
27	arel (~> 3.0.2)	27	arel (~> 3.0.2)
28	tzinfo (~> 0.3.29)	28	tzinfo (~> 0.3.29)
29	- activeresource (3.2.18)
30	- activemodel (= 3.2.18)
31	- activesupport (= 3.2.18)
32	- activesupport (3.2.18)	29	+ activeresource (3.2.19)
		30	+ activemodel (= 3.2.19)
		31	+ activesupport (= 3.2.19)
		32	+ activesupport (3.2.19)
33	i18n (~> 0.6, >= 0.6.4)	33	i18n (~> 0.6, >= 0.6.4)
34	multi_json (~> 1.0)	34	multi_json (~> 1.0)
35	addressable (2.3.6)	35	addressable (2.3.6)
	@@ -177,7 +177,7 @@ GEM		@@ -177,7 +177,7 @@ GEM
177	kgio (2.8.1)	177	kgio (2.8.1)
178	launchy (2.3.0)	178	launchy (2.3.0)
179	addressable (~> 2.3)	179	addressable (~> 2.3)
180	- libv8 (3.16.14.3)	180	+ libv8 (3.16.14.7)
181	libxml-ruby (2.7.0)	181	libxml-ruby (2.7.0)
182	lighthouse-api (2.0)	182	lighthouse-api (2.0)
183	activeresource (>= 3.0.0)	183	activeresource (>= 3.0.0)
	@@ -260,7 +260,7 @@ GEM		@@ -260,7 +260,7 @@ GEM
260	cliver (~> 0.3.1)	260	cliver (~> 0.3.1)
261	multi_json (~> 1.0)	261	multi_json (~> 1.0)
262	websocket-driver (>= 0.2.0)	262	websocket-driver (>= 0.2.0)
263	- polyglot (0.3.4)	263	+ polyglot (0.3.5)
264	premailer (1.7.3)	264	premailer (1.7.3)
265	css_parser (>= 1.1.9)	265	css_parser (>= 1.1.9)
266	htmlentities (>= 4.0.0)	266	htmlentities (>= 4.0.0)
	@@ -284,25 +284,25 @@ GEM		@@ -284,25 +284,25 @@ GEM
284	rack-ssl-enforcer (0.2.6)	284	rack-ssl-enforcer (0.2.6)
285	rack-test (0.6.2)	285	rack-test (0.6.2)
286	rack (>= 1.0)	286	rack (>= 1.0)
287	- rails (3.2.18)
288	- actionmailer (= 3.2.18)
289	- actionpack (= 3.2.18)
290	- activerecord (= 3.2.18)
291	- activeresource (= 3.2.18)
292	- activesupport (= 3.2.18)	287	+ rails (3.2.19)
		288	+ actionmailer (= 3.2.19)
		289	+ actionpack (= 3.2.19)
		290	+ activerecord (= 3.2.19)
		291	+ activeresource (= 3.2.19)
		292	+ activesupport (= 3.2.19)
293	bundler (~> 1.0)	293	bundler (~> 1.0)
294	- railties (= 3.2.18)	294	+ railties (= 3.2.19)
295	rails_autolink (1.1.4)	295	rails_autolink (1.1.4)
296	rails (> 3.1)	296	rails (> 3.1)
297	- railties (3.2.18)
298	- actionpack (= 3.2.18)
299	- activesupport (= 3.2.18)	297	+ railties (3.2.19)
		298	+ actionpack (= 3.2.19)
		299	+ activesupport (= 3.2.19)
300	rack-ssl (~> 1.3.2)	300	rack-ssl (~> 1.3.2)
301	rake (>= 0.8.7)	301	rake (>= 0.8.7)
302	rdoc (~> 3.4)	302	rdoc (~> 3.4)
303	thor (>= 0.14.6, < 2.0)	303	thor (>= 0.14.6, < 2.0)
304	raindrops (0.12.0)	304	raindrops (0.12.0)
305	- rake (10.3.1)	305	+ rake (10.3.2)
306	rdoc (3.12.2)	306	rdoc (3.12.2)
307	json (~> 1.4)	307	json (~> 1.4)
308	ref (1.0.5)	308	ref (1.0.5)
	@@ -352,7 +352,7 @@ GEM		@@ -352,7 +352,7 @@ GEM
352	railties (~> 3.0)	352	railties (~> 3.0)
353	term-ansicolor (1.2.2)	353	term-ansicolor (1.2.2)
354	tins (~> 0.8)	354	tins (~> 0.8)
355	- therubyracer (0.12.0)	355	+ therubyracer (0.12.1)
356	libv8 (~> 3.16.14.0)	356	libv8 (~> 3.16.14.0)
357	ref	357	ref
358	thor (0.19.1)	358	thor (0.19.1)
	@@ -367,7 +367,7 @@ GEM		@@ -367,7 +367,7 @@ GEM
367	turbo-sprockets-rails3 (0.3.10)	367	turbo-sprockets-rails3 (0.3.10)
368	railties (> 3.2.8, < 4.0.0)	368	railties (> 3.2.8, < 4.0.0)
369	sprockets (>= 2.0.0)	369	sprockets (>= 2.0.0)
370	- tzinfo (0.3.39)	370	+ tzinfo (0.3.41)
371	uglifier (2.2.1)	371	uglifier (2.2.1)
372	execjs (>= 0.3.0)	372	execjs (>= 0.3.0)
373	json (>= 1.8.0)	373	json (>= 1.8.0)
	@@ -392,9 +392,9 @@ PLATFORMS		@@ -392,9 +392,9 @@ PLATFORMS
392	ruby	392	ruby
393		393
394	DEPENDENCIES	394	DEPENDENCIES
395	- actionmailer (~> 3.2.18)	395	+ actionmailer (~> 3.2.19)
396	actionmailer_inline_css	396	actionmailer_inline_css
397	- actionpack (~> 3.2.18)	397	+ actionpack (~> 3.2.19)
398	airbrake	398	airbrake
399	better_errors	399	better_errors
400	binding_of_caller	400	binding_of_caller
	@@ -443,7 +443,7 @@ DEPENDENCIES		@@ -443,7 +443,7 @@ DEPENDENCIES
443	rack-ssl	443	rack-ssl
444	rack-ssl-enforcer	444	rack-ssl-enforcer
445	rails_autolink	445	rails_autolink
446	- railties (~> 3.2.18)	446	+ railties (~> 3.2.19)
447	ri_cal	447	ri_cal
448	rspec-rails	448	rspec-rails
449	rushover	449	rushover
1	class Api::V1::ProblemsController < ApplicationController	1	class Api::V1::ProblemsController < ApplicationController
2	respond_to :json, :xml	2	respond_to :json, :xml
		3	+ FIELDS = %w{app_id app_name environment message where first_notice_at last_notice_at resolved resolved_at notices_count}
		4	+
		5	+ def show
		6	+ result = benchmark("[api/v1/problems_controller/show] query time") do
		7	+ begin
		8	+ Problem.only(FIELDS).find(params[:id])
		9	+ rescue Mongoid::Errors::DocumentNotFound
		10	+ head :not_found
		11	+ return false
		12	+ end
		13	+ end
		14	+
		15	+ respond_to do \|format\|
		16	+ format.any(:html, :json) { render :json => result } # render JSON if no extension specified on path
		17	+ format.xml { render :xml => result }
		18	+ end
		19	+ end
3		20
4	def index	21	def index
5	query = {}	22	query = {}
6	- fields = %w{app_id app_name environment message where first_notice_at last_notice_at resolved resolved_at notices_count}
7		23
8	if params.key?(:start_date) && params.key?(:end_date)	24	if params.key?(:start_date) && params.key?(:end_date)
9	start_date = Time.parse(params[:start_date]).utc	25	start_date = Time.parse(params[:start_date]).utc
	@@ -11,8 +27,8 @@ class Api::V1::ProblemsController < ApplicationController		@@ -11,8 +27,8 @@ class Api::V1::ProblemsController < ApplicationController
11	query = {:first_notice_at=>{"$lte"=>end_date}, "$or"=>[{:resolved_at=>nil}, {:resolved_at=>{"$gte"=>start_date}}]}	27	query = {:first_notice_at=>{"$lte"=>end_date}, "$or"=>[{:resolved_at=>nil}, {:resolved_at=>{"$gte"=>start_date}}]}
12	end	28	end
13		29
14	- results = benchmark("[api/v1/problems_controller] query time") do
15	- Problem.where(query).with(:consistency => :strong).only(fields).to_a	30	+ results = benchmark("[api/v1/problems_controller/index] query time") do
		31	+ Problem.where(query).with(:consistency => :strong).only(FIELDS).to_a
16	end	32	end
17		33
18	respond_to do \|format\|	34	respond_to do \|format\|
	@@ -6,7 +6,12 @@ class Mailer < ActionMailer::Base		@@ -6,7 +6,12 @@ class Mailer < ActionMailer::Base
6	helper ApplicationHelper	6	helper ApplicationHelper
7	helper BacktraceLineHelper	7	helper BacktraceLineHelper
8		8
9	- default :from => Errbit::Config.email_from	9	+ default :from => Errbit::Config.email_from,
		10	+ 'X-Errbit-Host' => Errbit::Config.host,
		11	+ 'X-Mailer' => 'Errbit',
		12	+ 'X-Auto-Response-Suppress' => 'OOF, AutoReply',
		13	+ 'Precedence' => 'bulk',
		14	+ 'Auto-Submitted' => 'auto-generated'
10		15
11	def err_notification(notice)	16	def err_notification(notice)
12	@notice = notice	17	@notice = notice
	@@ -15,6 +20,10 @@ class Mailer < ActionMailer::Base		@@ -15,6 +20,10 @@ class Mailer < ActionMailer::Base
15	count = @notice.similar_count	20	count = @notice.similar_count
16	count = count > 1 ? "(#{count}) " : ""	21	count = count > 1 ? "(#{count}) " : ""
17		22
		23	+ errbit_headers 'App' => @app.name,
		24	+ 'Environment' => @notice.environment_name,
		25	+ 'Error-Id' => @notice.err_id
		26	+
18	mail :to => @app.notification_recipients,	27	mail :to => @app.notification_recipients,
19	:subject => "#{count}[#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"	28	:subject => "#{count}[#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"
20	end	29	end
	@@ -23,6 +32,11 @@ class Mailer < ActionMailer::Base		@@ -23,6 +32,11 @@ class Mailer < ActionMailer::Base
23	@deploy = deploy	32	@deploy = deploy
24	@app = deploy.app	33	@app = deploy.app
25		34
		35	+ errbit_headers 'App' => @app.name,
		36	+ 'Environment' => @deploy.environment,
		37	+ 'Deploy-Revision' => @deploy.revision,
		38	+ 'Deploy-User' => @deploy.username
		39	+
26	mail :to => @app.notification_recipients,	40	mail :to => @app.notification_recipients,
27	:subject => "[#{@app.name}] Deployed to #{@deploy.environment} by #{@deploy.username}"	41	:subject => "[#{@app.name}] Deployed to #{@deploy.environment} by #{@deploy.username}"
28	end	42	end
	@@ -36,7 +50,18 @@ class Mailer < ActionMailer::Base		@@ -36,7 +50,18 @@ class Mailer < ActionMailer::Base
36		50
37	recipients = @comment.notification_recipients	51	recipients = @comment.notification_recipients
38		52
		53	+ errbit_headers 'App' => @app.name,
		54	+ 'Environment' => @notice.environment_name,
		55	+ 'Problem-Id' => @problem.id,
		56	+ 'Comment-Author' => @user.name
		57	+
39	mail :to => recipients,	58	mail :to => recipients,
40	:subject => "#{@user.name} commented on [#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"	59	:subject => "#{@user.name} commented on [#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"
41	end	60	end
		61	+
		62	+ private
		63	+
		64	+ def errbit_headers(header)
		65	+ header.each { \|key,value\| headers["X-Errbit-#{key}"] = value.to_s }
		66	+ end
42	end	67	end
	@@ -54,6 +54,6 @@ class NotificationService		@@ -54,6 +54,6 @@ class NotificationService
54	end	54	end
55		55
56	def problem_url(problem)	56	def problem_url(problem)
57	- "http://#{Errbit::Config.host}/apps/#{problem.app.id}/problems/#{problem.id}"	57	+ "#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id}/problems/#{problem.id}"
58	end	58	end
59	end	59	end
	@@ -30,7 +30,7 @@ if defined? Campy		@@ -30,7 +30,7 @@ if defined? Campy
30	# build the campfire client	30	# build the campfire client
31	campy = Campy::Room.new(:account => subdomain, :token => api_token, :room_id => room_id)	31	campy = Campy::Room.new(:account => subdomain, :token => api_token, :room_id => room_id)
32	# post the issue to the campfire room	32	# post the issue to the campfire room
33	- campy.speak "[errbit] #{problem.app.name} #{notification_description problem} - http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}/problems/#{problem.id.to_s}"	33	+ campy.speak "[errbit] #{problem.app.name} #{notification_description problem} - #{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}/problems/#{problem.id.to_s}"
34	end	34	end
35	end	35	end
36	end	36	end
	@@ -47,7 +47,7 @@ class NotificationServices::GtalkService < NotificationService		@@ -47,7 +47,7 @@ class NotificationServices::GtalkService < NotificationService
47		47
48	#has to look like this to be formatted properly in the client	48	#has to look like this to be formatted properly in the client
49	message = """#{problem.app.name.to_s}	49	message = """#{problem.app.name.to_s}
50	-http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}	50	+#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
51	#{notification_description problem}"""	51	#{notification_description problem}"""
52		52
53	# post the issue to the xmpp room(s)	53	# post the issue to the xmpp room(s)
	@@ -35,7 +35,7 @@ class NotificationServices::HoiioService < NotificationService		@@ -35,7 +35,7 @@ class NotificationServices::HoiioService < NotificationService
35		35
36	# send sms	36	# send sms
37	room_id.split(',').each do \|number\|	37	room_id.split(',').each do \|number\|
38	- sms.send :dest => number, :msg => "http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s} #{notification_description problem}"	38	+ sms.send :dest => number, :msg => "#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s} #{notification_description problem}"
39	end	39	end
40		40
41	end	41	end
	@@ -26,7 +26,7 @@ class NotificationServices::PushoverService < NotificationService		@@ -26,7 +26,7 @@ class NotificationServices::PushoverService < NotificationService
26	notification = Rushover::Client.new(subdomain)	26	notification = Rushover::Client.new(subdomain)
27		27
28	# send push notification to pushover	28	# send push notification to pushover
29	- notification.notify(api_token, "#{notification_description problem}", :priority => 1, :title => "Errbit Notification", :url => "http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}", :url_title => "Link to error")	29	+ notification.notify(api_token, "#{notification_description problem}", :priority => 1, :title => "Errbit Notification", :url => "#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}", :url_title => "Link to error")
30		30
31	end	31	end
32	end	32	end