Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Remove dependency on marples and the associated initialisers

Panopticon no longer interacts with the message broker so it doesn't make sense to have all the supporting code for that and the associated dependency on apollo being up.

We may return to using some sort of queuing/async processing but we don't need that right now.
  • Loading branch information...
commit e125553c9145f66f2d2fe5d73aa6b2344459a3ca 1 parent 904de8f
@jystewart jystewart authored
View
1  Gemfile
@@ -12,7 +12,6 @@ gem 'plek', '~> 0'
gem 'formtastic', git: 'git://github.com/justinfrench/formtastic.git', branch: '2.1-stable'
gem 'formtastic-bootstrap', git: 'git://github.com/cgunther/formtastic-bootstrap.git', branch: 'bootstrap-2'
gem 'stomp'
-gem 'marples', '~> 1.0'
gem 'whenever'
gem 'ansi'
gem 'gelf'
View
5 Gemfile.lock
@@ -143,10 +143,6 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- marples (1.0.5)
- activesupport
- i18n
- null_logger
mechanize (2.0.1)
net-http-digest_auth (~> 1.1, >= 1.1.1)
net-http-persistent (~> 1.8)
@@ -287,7 +283,6 @@ DEPENDENCIES
gelf
govuk_content_models (~> 0.0.19)
launchy
- marples (~> 1.0)
minitest
mocha
mongo (= 1.5.2)
View
17 config/initializers/messenger.rb
@@ -1,17 +0,0 @@
-require 'messenger'
-
-if Rails.env.test? or ENV['NO_MESSENGER'].present?
- Messenger.transport = Marples::NullTransport.instance
-else
- stomp_url = "failover://(stomp://support.cluster:61613,stomp://support.cluster:61613)"
-
- if defined?(PhusionPassenger)
- PhusionPassenger.on_event(:starting_worker_process) do |forked|
- if forked
- Messenger.transport = Stomp::Client.new stomp_url
- end
- end
- else
- Messenger.transport = Stomp::Client.new stomp_url
- end
-end
View
22 features/support/fake_transport.rb
@@ -1,22 +0,0 @@
-class FakeTransport
- include Singleton
-
- attr_reader :notifications
-
- def initialize
- flush
- end
-
- def flush
- self.notifications = []
- end
-
- def publish(destination, message, headers = {})
- notifications << { destination: destination, message: Hash.from_xml(message).with_indifferent_access, headers: headers }
- end
-
- private
- attr_writer :notifications
-end
-
-Messenger.transport = FakeTransport.instance
View
12 lib/messenger.rb
@@ -1,12 +0,0 @@
-class Messenger
- include Singleton
- cattr_accessor :transport
-
- def method_missing *args
- client.send *args
- end
-
- def client
- @client ||= Marples::Client.new self.class.transport, "panopticon", Rails.logger
- end
-end
Please sign in to comment.
Something went wrong with that request. Please try again.