Skip to content
Open
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
14 changes: 3 additions & 11 deletions cogs/start.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@
require File.expand_path('../../lib/redis_subscriber', __FILE__)
require File.expand_path('../../lib/shared_config', __FILE__)
require File.expand_path('../reaper', __FILE__)
require File.expand_path('../twitter_tweeter', __FILE__)

opts = Trollop.options do
opt :redis, 'URL of Redis server', :default => ENV['REDIS_URL'] || 'redis://localhost:6379/0'
opt :db, 'URL of CouchDB history database', :default => ENV['COUCHDB_URL'] || 'http://localhost:5984/archivebot'
opt :db_credentials, 'Credentials for history database (USERNAME:PASSWORD)', :type => String, :default => nil
opt :log_db, 'URL of CouchDB log database', :default => ENV['LOGDB_URL'] || 'http://localhost:5984/archivebot_logs'
opt :log_db_credentials, 'Credentials for log database (USERNAME:PASSWORD)', :type => String, :default => nil
opt :twitter_config, 'Filename containing Twitter key config', :type => String, :default => nil
opt :twitter_config, 'Deprecated option', :type => String, :default => nil # if not used anymore, can be removed
end

class Broadcaster < RedisSubscriber
Expand All @@ -25,15 +24,12 @@ def on_receive(ident)
return unless job

job.freeze

Celluloid::Actor[:twitter_tweeter].async.process(job)
end
end

db_uri = URI(opts[:db])

Reaper.supervise_as :reaper, opts[:redis]
TwitterTweeter.supervise_as :twitter_tweeter, opts[:redis], opts[:twitter_config]

ignore_patterns_path = File.expand_path('../../db/ignore_patterns', __FILE__)

Expand All @@ -45,16 +41,12 @@ def on_receive(ident)
UserAgentUpdater.supervise_as :user_agent_updater,
user_agents_path, db_uri, opts[:db_credentials]

# This should be started after all actors it references have started, which is
# why it's the last actor to start up.

if opts[:twitter_config]
Broadcaster.supervise_as :broadcaster, opts[:redis], SharedConfig.log_channel
STDERR.puts "twitter_config option is now deprecated"
end

at_exit do
if opts[:twitter_config]
Celluloid::Actor[:broadcaster].stop
end
Celluloid::Actor[:ignore_pattern_updater].stop
Celluloid::Actor[:user_agent_updater].stop
end
Expand Down
7 changes: 0 additions & 7 deletions cogs/twitter_conf.json

This file was deleted.

130 changes: 0 additions & 130 deletions cogs/twitter_tweeter.rb

This file was deleted.