mail_spy 0.0.12 → 0.0.13

data/README.rdoc

@@ -15,6 +15,9 @@ Add gem "mailspy" to your Gemfile
 If you haven't already create a mongoid.yml file for the mongodb connection
  rails generate mongoid:config
 
+ If you are going to be sending on one machine make sure to scale up the pool
+ from the default of 1 to 10+ to get good performance. Timeouts are also a good idea
+
 Create the mongoid configuration for the mongo db
 
  rails g mail_spy:initializer

data/lib/mail_spy/manager.rb

@@ -73,7 +73,7 @@ module MailSpy
     def send_outstanding_emails(step=100, num_threads=50)
       raise "No Email service providers installed" unless MailSpy.esps.present?
 
-      pool = MailSpy::ThreadPool.new(num_threads)
+      wq = WorkQueue.new(num_threads, step*2)
       offset = 0
       sent = 0
 
@@ -84,14 +84,13 @@ module MailSpy
         pony_hash[pony_key] = value if value.present?
       end
 
-
       while true
         emails = MailSpy::Email.
           limit(step).offset(offset).
           where(:schedule_at.lte => DateTime.now, :sent => false, :failed => false).all
         break if emails.blank?
         emails.each do |email|
-          pool.schedule do
+          wq.enqueue_b do
             begin
               MailSpy::CoreMailer.template(email).deliver
               email.update_attribute(:sent, true)
@@ -103,16 +102,11 @@ module MailSpy
               email.save!
             end
           end
-
-          while(pool.job_queue_size > (2 * num_threads))
-            sleep(1)
-          end
-
         end
         offset += step
       end
 
-      pool.shutdown
+      wq.join
       sent
     end
 

data/lib/mail_spy/version.rb

@@ -1,3 +1,3 @@
 module MailSpy
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/mail_spy.rb

@@ -1,7 +1,7 @@
 require 'pp' #For debugging
 require 'aws-sdk'
 require 'mail_spy/sendgrid/smtp_api_header'
-require 'mail_spy/thread_pool'
+require 'work_queue'
 require "mongoid"
 require "mail_spy/engine"
 require "mail_spy/manager"

metadata

@@ -2,7 +2,7 @@
 name: mail_spy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - Timothy Cardenas
@@ -68,7 +68,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: jquery-rails
+  name: work_queue
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -79,7 +79,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: jquery-rails
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -87,10 +87,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: turn
+  name: sqlite3
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -101,7 +101,7 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rr
+  name: turn
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -112,7 +112,7 @@ dependencies:
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: factory_girl
+  name: rr
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -123,7 +123,7 @@ dependencies:
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: factory_girl_rails
+  name: factory_girl
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -134,29 +134,29 @@ dependencies:
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: spork
+  name: factory_girl_rails
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.0.rc
+        version: "0"
   type: :development
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: spork-testunit
+  name: spork
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.0.rc
   type: :development
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: ruby-prof
+  name: spork-testunit
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
@@ -167,7 +167,7 @@ dependencies:
   type: :development
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: ruby-prof
   prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
@@ -178,7 +178,7 @@ dependencies:
   type: :development
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: timecop
+  name: minitest
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
@@ -188,6 +188,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: timecop
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id017
 description: Mailspy allows for quick and easy creation, sending and tracking of email campaigns
 email: 
 - trcarden@gmail.com
@@ -225,7 +236,6 @@ files:
 - lib/mail_spy/engine.rb
 - lib/mail_spy/manager.rb
 - lib/mail_spy/sendgrid/smtp_api_header.rb
-- lib/mail_spy/thread_pool.rb
 - lib/mail_spy/version.rb
 - lib/mail_spy.rb
 - lib/tasks/mail_spy_tasks.rake

data/lib/mail_spy/thread_pool.rb

@@ -1,119 +0,0 @@
-# Ruby Thread ThreadPool
-# ================
-# A thread pool is useful when you wish to do some work in a thread, but do
-# not know how much work you will be doing in advance. Spawning one thread
-# for each task is potentially expensive, as threads are not free.
-#
-# In this case, it might be more beneficial to start a predefined set of
-# threads and then hand off work to them as it becomes available. This is
-# the pure essence of what a thread pool is: an array of threads, all just
-# waiting to do some work for you!
-#
-# Prerequisites
-# -------------
-
-# We need the [Queue](http://rdoc.info/stdlib/thread/1.9.2/Queue), as our
-# thread pool is largely dependent on it. Thanks to this, the implementation
-# becomes very simple!
-require 'thread'
-
-module MailSpy
-# Public Interface
-# ----------------
-
-# `ThreadPool` is our thread pool class. It will allow us to do three operations:
-#
-# - `.new(size)` creates a thread pool of a given size
-# - `#schedule(*args, &job)` schedules a new job to be executed
-# - `#shutdown` shuts down all threads (after letting them finish working, of course)
-  class ThreadPool
-
-    # ### initialization, or `ThreadPool.new(size)`
-    # Creating a new `ThreadPool` involves a certain amount of work. First, however,
-    # we need to define its’ `size`. It defines how many threads we will have
-    # working internally.
-    #
-    # Which size is best for you is hard to answer. You do not want it to be
-    # too low, as then you won’t be able to do as many things concurrently.
-    # However, if you make it too high Ruby will spend too much time switching
-    # between threads, and that will also degrade performance!
-    def initialize(size)
-      # Before we do anything else, we need to store some information about
-      # our pool. `@size` is useful later, when we want to shut our pool down,
-      # and `@jobs` is the heart of our pool that allows us to schedule work.
-      @size = size
-      @jobs = Queue.new
-
-      # #### Creating our pool of threads
-      # Once preparation is done, it’s time to create our pool of threads.
-      # Each thread store its’ index in a thread-local variable, in case we
-      # need to know which thread a job is executing in later on.
-      @pool = Array.new(@size) do |i|
-        Thread.new do
-          Thread.current[:id] = i
-
-          # We start off by defining a `catch` around our worker loop. This
-          # way we’ve provided a method for graceful shutdown of our threads.
-          # Shutting down is merely a `#schedule { throw :exit }` away!
-          catch(:exit) do
-            # The worker thread life-cycle is very simple. We continuously wait
-            # for tasks to be put into our job `Queue`. If the `Queue` is empty,
-            # we will wait until it’s not.
-            loop do
-              # Once we have a piece of work to be done, we will pull out the
-              # information we need and get to work.
-              job, args = @jobs.pop
-              job.call(*args)
-            end
-          end
-        end
-      end
-    end
-
-    def job_queue_size
-      @jobs.size
-    end
-
-    # ### Work scheduling
-
-    # To schedule a piece of work to be done is to say to the `ThreadPool` that you
-    # want something done.
-    def schedule(*args, &block)
-      # Your given task will not be run immediately; rather, it will be put
-      # into the work `Queue` and executed once a thread is ready to work.
-      @jobs << [block, args]
-    end
-
-    # ### Graceful shutdown
-
-    # If you ever wish to close down your application, I took the liberty of
-    # making it easy for you to wait for any currently executing jobs to finish
-    # before you exit.
-    def shutdown
-      # A graceful shutdown involves threads exiting cleanly themselves, and
-      # since we’ve defined a `catch`-handler around the threads’ worker loop
-      # it is simply a matter of throwing `:exit`. Thus, if we throw one `:exit`
-      # for each thread in our pool, they will all exit eventually!
-      @size.times do
-        schedule { throw :exit }
-      end
-
-      # And now one final thing: wait for our `throw :exit` jobs to be run on
-      # all our worker threads. This call will not return until all worker threads
-      # have exited.
-      @pool.map(&:join)
-    end
-  end
-end
-# example
-#if $0 == __FILE__
-#  p = Pool.new(10)
-#
-#  20.times do |i|
-#    p.schedule do
-#      sleep rand(4) + 2
-#      puts "Job #{i} finished by thread #{Thread.current[:id]}"
-#    end
-#  end
-# at_exit { p.shutdown }
-#end