edamame 0.2.0 → 0.2.1

data/README.textile

@@ -29,22 +29,28 @@ Send Edamame questions to the "Infinite Monkeywrench mailing list":http://groups
 
 h2. Requirements and Installation
 
-h3. Get the Code
+h2. Install
 
-We're still actively developing {{ site.gemname }}.  The newest version is available via "Git":http://git-scm.com on "github:":http://github.com/mrflip/{{ site.gemname }}
+** "Main Install and Setup Documentation":http://mrflip.github.com/edamame/INSTALL.html **
 
-pre. $ git clone git://github.com/mrflip/{{ site.gemname }}
+h3. Get the code
 
-A gem is available from "gemcutter:":http://gemcutter.org/gems/{{ site.gemname }}
+We're still actively developing edamame.  The newest version is available via "Git":http://git-scm.com on "github:":http://github.com/mrflip/edamame
 
-pre. $ sudo gem install {{ site.gemname }} --source=http://gemcutter.org
+pre. $ git clone git://github.com/mrflip/edamame
+
+A gem is available from "gemcutter:":http://gemcutter.org/gems/edamame
+
+pre. $ sudo gem install edamame --source=http://gemcutter.org
 
 (don't use the gems.github.com version -- it's way out of date.)
 
-You can instead download this project in either "zip":http://github.com/mrflip/{{ site.gemname }}/zipball/master or "tar":http://github.com/mrflip/{{ site.gemname }}/tarball/master formats.
+You can instead download this project in either "zip":http://github.com/mrflip/edamame/zipball/master or "tar":http://github.com/mrflip/edamame/tarball/master formats.
 
 h3. Get the Dependencies
 
+To finish setting up, see the "detailed setup instructions":http://mrflip.github.com/edamame/INSTALL.html and then read the "usage notes":http://mrflip.github.com/edamame/usage.html
+
 * "beanstalkd 1.3,":http://xph.us/dist/beanstalkd/ "libevent 1.4,":http://monkey.org/~provos/libevent/ and "beanstalk-client":http://github.com/dustin/beanstalk-client
 * "Tokyo Tyrant,":http://tokyocabinet.sourceforge.net/tyrantdoc/ "Tokyo Tyrant Ruby libs,":http://tokyocabinet.sourceforge.net/tyrantrubydoc/ "Tokyo Cabinet,":http://tokyocabinet.sourceforge.net and "Tokyo Cabinet Ruby libs":http://tokyocabinet.sourceforge.net/tyrantdoc/
 * Gems: "wukong":http://mrflip.github.com/wukong and "monkeyshines":http://mrflip.github.com/monkeyshines
@@ -88,3 +94,19 @@ There's a **fuller set of docs** at "http://mrflip.github.com/edamame":http://mr
 ** http://railscasts.com/episodes/130-monitoring-with-god
 ** Some code for the god conf is inspired by that railscast, "this pastie,":http://pastie.textmate.org/private/ovgxu2ihoicli2ktrwtbew the "one from the god docs":http://god.rubyforge.org/, and "Configuring GMail notifiers in God":http://millarian.com/programming/ruby-on-rails/monitoring-thin-using-god-with-google-apps-notifications/
 ** Alternatives to God include (in order of complexity): "Monit,":http://mmonit.com/monit/ perhaps "with Munin;":http://www.howtoforge.com/server_monitoring_monit_munin "Cacti":http://www.cacti.net/ and "Hyperic":http://www.hyperic.com/
+
+---------------------------------------------------------------------------
+
+<notextile><div class="toggle"></notextile>
+
+h2. More info
+
+h3. Credits
+
+Edamame was written by "Philip (flip) Kromer":http://mrflip.com (flip@infochimps.org / "@mrflip":http://twitter.com/mrflip) for the "infochimps project":http://infochimps.org
+
+h3. Help!
+
+Send wuclan questions to the "Infinite Monkeywrench mailing list":http://groups.google.com/group/infochimps-code
+
+<notextile></div></notextile>

data/bin/edamame-nuke

@@ -2,6 +2,7 @@
 $: << File.dirname(__FILE__)+'/../../lib'
 require 'rubygems'
 require 'edamame'
+require 'wukong/logger'
 require 'monkeyshines/monitor'
 require 'monkeyshines/utils/trollop'
 require File.dirname(__FILE__)+'/edamame_util_opts'
@@ -11,9 +12,9 @@ pq = Edamame::PersistentQueue.new( :tube => CONFIG[:tube],
   :store => { :type => 'TyrantStore',    :uri =>   CONFIG[:store]  }
   )
 
-periodic_log = Monkeyshines::Monitor::PeriodicLogger.new(:iters => 1000, :time => 30)
+periodic_log = Monkeyshines::Monitor::PeriodicLogger.new(:iters => 100, :time => 30)
 pq.queue.empty_all do |job|
-  periodic_log.periodically{ [ job.tube, job.priority, job.delay, job.scheduling, job.obj['key'] ] }
+  periodic_log.periodically{ [ job.tube, job.priority, job.delay, job.body ] }
 end
 pq.store.each do |key, val|
   pq.store.db.out key

data/bin/edamame-sync

@@ -16,6 +16,5 @@ pq = Edamame::PersistentQueue.new( :tube => CONFIG[:tube],
 periodic_log = Monkeyshines::Monitor::PeriodicLogger.new(:iters => 1, :time => 30)
 pq.load do |job|
   obj = job.obj rescue nil
-
   periodic_log.periodically{ [ pq.store.size, job.loggable, job.class, obj.inspect ] }
 end

data/lib/edamame/monitoring/tyrant_god.rb

@@ -47,6 +47,12 @@ class TyrantGod < GodProcess
     File.join(options[:db_dirname], basename)
   end
 
+  # create any directories required by the process
+  def mkdirs!
+    super
+    FileUtils.mkdir_p File.dirname(dbname)
+  end
+
   def start_command
     [
       options[:server_exe],

data/lib/edamame/queue/beanstalk.rb

@@ -109,14 +109,16 @@ module Edamame
         curr_watches = beanstalk.list_tubes_watched.values.first
         beanstalk.use   tube if tube
         beanstalk.watch tube if tube
-        p ["emptying", tube, current_jobs]
+        print "emptying\t%-23s\t%7d\t" % [tube, current_jobs]
         loop do
           kicked = beanstalk.open_connections.map{|conxn| conxn.kick(20) }
           break if (current_jobs == 0) || (!beanstalk.peek_ready)
           qjob = reserve(5) or break
           yield qjob
+          print '.'
           qjob.delete
         end
+        print "\n"
         beanstalk.use curr_tube
         beanstalk.ignore tube if (! curr_watches.include?(tube))
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: edamame
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Philip (flip) Kromer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 -05:00
+date: 2009-11-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,9 +47,8 @@ description: "Edamame combines the Beanstalk priority queue with a Tokyo Tyrant
 email: flip@infochimps.org
 executables: 
 - edamame-nuke
-- edamame-ps
-- edamame-stats
 - edamame-sync
+- edamame-stats
 extensions: []
 
 extra_rdoc_files: