Merge pull request stringer-rss#283 from swanson/experiment-with-workers

Koronen · Koronen · commit c6181d53fb85 · 2013-11-26T01:19:10.000-08:00
Experiment with workers
diff --git a/README.md b/README.md
@@ -29,6 +29,7 @@ cd stringer
 heroku create
 git push heroku master
 
+heroku config:set APP_URL=`heroku apps:info | grep -o 'http[^"]*'`
 heroku config:set SECRET_TOKEN=`openssl rand -hex 20`
 
 heroku run rake db:migrate
diff --git a/Rakefile b/Rakefile
@@ -1,9 +1,11 @@
 require "sinatra/activerecord/rake"
 require "rubygems"
 require "bundler"
+require "net/http"
 Bundler.require
 
 require "./app"
+require_relative "./app/jobs/fetch_feed_job"
 require_relative "./app/tasks/fetch_feeds"
 require_relative "./app/tasks/change_password"
 require_relative "./app/tasks/remove_old_stories.rb"
@@ -13,6 +15,18 @@ task :fetch_feeds do
   FetchFeeds.new(Feed.all).fetch_all
 end
 
+desc "Lazily fetch all feeds."
+task :lazy_fetch do
+  if ENV['APP_URL']
+    uri = URI(ENV['APP_URL'])
+    Net::HTTP.get_response(uri)
+  end
+
+  FeedRepository.list.each do |feed|
+    Delayed::Job.enqueue FetchFeedJob.new(feed.id)
+  end
+end
+
 desc "Fetch single feed"
 task :fetch_feed, :id do |t, args|
   FetchFeed.new(Feed.find(args[:id])).fetch
@@ -25,7 +39,12 @@ end
 
 desc "Work the delayed_job queue."
 task :work_jobs do
-  Delayed::Worker.new(:min_priority => ENV['MIN_PRIORITY'], :max_priority => ENV['MAX_PRIORITY']).start
+  Delayed::Job.delete_all
+
+  3.times do
+    Delayed::Worker.new(:min_priority => ENV['MIN_PRIORITY'], 
+      :max_priority => ENV['MAX_PRIORITY']).start
+  end
 end
 
 desc "Change your password"
diff --git a/app/jobs/fetch_feed_job.rb b/app/jobs/fetch_feed_job.rb
@@ -0,0 +1,6 @@
+class FetchFeedJob < Struct.new(:feed_id)
+  def perform
+    feed = FeedRepository.fetch(feed_id)
+    FetchFeed.new(feed).fetch
+  end
+end
diff --git a/config/unicorn.rb b/config/unicorn.rb
@@ -1,4 +1,4 @@
-worker_processes 3
+worker_processes 1
 timeout 30
 preload_app true
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-worker_processes 3`
	`1`	`+worker_processes 1`
`2`	`2`	`timeout 30`
`3`	`3`	`preload_app true`
`4`	`4`