skynet 0.9.1 → 0.9.2

data/History.txt

@@ -1,3 +1,102 @@
+== 0.9.2 2008-01-22
+Highlights: 
+ - Multiple Message Queues
+ - Many more Job options including options to control how jobs are distributed.
+ - The various options for how a job is run has been made much clearer.
+ - The Mysql Message Queue Adapter has been optimized and made more reliable.
+ - You can now control how many times skynet retries failed master, map and reduce tasks.
+ - Large data sets can now be streamed to the queue.
+
+Details:
+
+Active::Record#distributed_find
+  - Active Record distributed_find now handles REALLY large sets by breaking them into seperate jobs. 1MM models per master broken into ranges of 1000.
+
+Skynet::Job
+  - code path through Skynet::Job is now clear. There are 3 ways to run Skynet::Job. Local Master (default), Remote Master, Async (implies remote master)
+  - Skynet::Job supports keep_map_tasks and keep_reduce_tasks settings.  
+    If true, the master will run the tasks locally.
+    If a number is provided, the master will run the tasks locally if there are LESS THAN OR EQUAL TO the number provided
+    There are also Skynet::CONFIG settings for defaults. DEFAULT_KEEP_REDUCE_TASKS, DEFAULT_KEEP_MAP_TASKS
+    I can see there being a problem with the timeouts being a little off... Since your kinda in a master and kinda in a map or reduce timeout.  The task timeouts will be correct at least.  Though, you won't get the benefit of redoes yet.
+  - Skynet::Job now supports setting RETRY times per job by MASTER, MAP and REDUCE. So you can have a MASTER_RETRY=0, but have MAP_RETRY=2 and REDUCE_RETRY=3.  There are now defaults for those as well :DEFAULT_MASTER_RETRY, :DEFAULT_MAP_RETRY, :DEFAULT_REDUCE_RETRY.    If a message passes its RETRY it will be marked with an iteration of -1.   delete_expired_messages removes those messages as well.  These show up in the stats as :failed_tasks.  Skynet::Task and Skynet::Message now have retry fields denoting the maximum number of retries.
+  - You can now pass queue_id or queue to Skynet::Job
+  - There is now a :MAX_RETRIES config setting that controls how many iterations Skynet will even look for tasks as well.
+  - You can now stream map_data to the queue by passing an Enumerable for your map_data
+  - Refactored Skynet::Job to be much cleaner and easier to test. 
+  - Skynet::Job now has access to a local queue which it can treat almost like the real one.
+  - deprecate Skynet::Job#run_master
+  - rename reduce_partitioner method to just reduce_partition
+  - Skynet::Job has better support for running tasks locally.  A job may run tasks in its own process if
+    you are running in solo mode, you've made a "single" job, or you set the keep_map_tasks or keep_reduce_tasks below.
+    When a job runs tasks locally it now honors the retry settings and timeouts.  
+  - Skynet::Job and Skynet::AsyncJob are now almost identical.  In fact you can just use Skynet::Job and tell it to run async.  
+  - Skynet::Job Changed map_tasks and reduce_tasks to mappers and reducers respectively.  This was to remove the ambiguity between the actual map/reduce tasks and the number of mappers/reducers desired.
+  - Skynet::Jobs can not be told what queue to use for that job by passing :queue or :queue_id DEFAULT 0
+  - Skynet::Job won't call the reduce_partitioner if there are no valid results from the map_step.
+
+MapreduceHelper mixin
+  - You can include MapreduceHelper into your class and then implement self.map_each and self.reduce_each methods.  The included self.map and self.reduce methods will handle iterating over the map_data and reduce_data, passing each element to your map_each and reduce_each methods respectively.  They will also handle error handling within that loop to make sure even if a single map or reduce fails, processing will continue.  If you do not want processing to continue if a map fails, do not use the MapreduceHelper mixin.
+
+Multiple Message Queues!
+  - Add the ability to have multiple message queues in the same table message_queue_table. 
+  - You can start skynet with a --queue_id or --queue option to determine which queue workers should look in.
+  - Skynet::Jobs can not be told what queue to use for that job by passing :queue or :queue_id.  DEFAULT 0
+  - Queues can be configred via Skynet::CONFIG[:MESSAGE_QUEUES] = [] which comes with an array of queues id 1 through 10 named "one" through "ten"
+
+Skynet Console
+  - You now start the skynet console by running 'skynet console' at the command line.   There is no longer a skynet_console app.
+  - The console now loads the configs that are in your local skynet script.
+  
+Skynet::Config
+  - Added Skynet.silent {} Runs your code with no debugging output.
+  - Made sure all config options for TupleSpace? adapter begin with TS and all Mysql adapter CONFIG settings start with MYSQL.        
+  - There is now a :MAX_RETRIES config setting that controls how many iterations Skynet will even look for tasks as well.
+
+Skynet::Partitioners
+  - Created a Skynet::Partitioners class where various partitioners can be found.  To specify one of them merely provide that specific Skynet::Partitioners subclass as your reduce_partitioner in your Skynet::Job
+
+Skynet Install
+ - skynet_install now has a --mysql option.  This installs the migration as well as a skynet_schema.sql file.
+
+Mysql Message Queue Adapter
+  - You can now configure your database options outside of rails with Skynet::CONFIG[:MYSQL_*] options.
+  - Mysql adapter now updates the updated_on time of rows in skynet_message_queues
+  - Fixed Mysql Message Adaptor to take_next_task safer and more efficiently.   There seems to be far less risk of a race condition where two workers would take the same task.
+  - Eliminated 1 db update per every task taken making it MUCH more efficient.
+  - Skynet::MessageQueueAdaptor::Mysql now tries to reconnect if it gets disconnected.   This was to solve the "Mysql Server has Gone Away" errors.
+  - Implemented version_active? in mysql message queue adapter.   It's a way for workers to check to see if a version is still in the queue.  
+  
+Skynet::Task
+  - Skynet::Task#master_task takes care of creating the master job and task now. I have mixed feelings about this.
+  - ENFORCED TIMEOUTS - Even though a master might give up on a worker if it didn't respond in time, there was nothing to step any given worker from running forever.  We now enforce the timeouts (master_timeout, map_timeout, reduce_timeout) given in Skynet::Job using the Timeout module.  This causes a Timeout::Error to be thrown.   If you are using the mysql adapter, this can cause strange results sometimes.   If the Timeout error is thrown during a DB query, ActiveRecord will throw an ActiveRecord::StatementInvalid exception which includes the Timeout::Error exception in it.  Not sure how to prevent that from happening.
+
+Skynet::Worker
+  - Workers now have a Skynet::CONFIG[:WORKER_MAX_PROCESSED] setting to control when to respawn based on how many that worker has processed.
+  - You can start skynet with a --queue_id or --queue option to determine which queue workers should look in.
+  - Workers do not restart until there are no more items in the queue of that version.
+
+Skynet::Message
+  - Skynet::Message now stores fields as an array.  It is far more efficient now as well.
+
+Now 90% more Tests!
+
+BUGFIXES
+- Skynet Workers now restart properly when the worker_version changes.
+- starting tuplespce_server, you no longer need to provide the --port if you're already providing the drburi- 
+- Fixed a bug where Skynet::MessageQueueAdapter::Mysql would sometimes pick up tasks another worker had already picked up.
+- Fix bug in Skynet::Worker where it wouldn't die right if the max processed was reached. 
+- Workers were supposed to restart when the worker_version changed.  They do that properly now.
+
+Thanks to Jason Rimmer for finding these bugs.
+- Fix bug in Skynet::Message where it would calculate the iteration improperly.
+- The skynet gem appears to be missing the Rubigen dependency
+- Running skynet_install even without the rails arg still generates code with rails dependencies and tailings: RAILS_ROOT, RAILS_ENV, and the various directory tailings such as 'db/migrate', etc.
+- Generated skynet script is missing "require 'rubygems'"
+- Specification of pid directory and file is incorrect as 'skynet_manager.rb' wants only a directory with it specifying the file
+- The sleep while waiting to start the queue server isn't long enough. There is now a CONFIG setting TS_SERVER_START_DELAY.
+
+
 == 0.0.1 2007-12-16
 
 * 1 major enhancement:

data/Manifest.txt

@@ -7,14 +7,14 @@ app_generators/skynet_install/USAGE
 app_generators/skynet_install/skynet_install_generator.rb
 app_generators/skynet_install/templates/migration.rb
 app_generators/skynet_install/templates/skynet
-app_generators/skynet_install/templates/skynet_console
+app_generators/skynet_install/templates/skynet_schema.sql
 bin/skynet
-bin/skynet_console
 bin/skynet_install
 bin/skynet_tuplespace_server
 config/hoe.rb
 config/requirements.rb
 lib/skynet.rb
+lib/skynet/mapreduce_helper.rb
 lib/skynet/mapreduce_test.rb
 lib/skynet/message_queue_adapters/message_queue_adapter.rb
 lib/skynet/message_queue_adapters/mysql.rb
@@ -31,6 +31,7 @@ lib/skynet/skynet_logger.rb
 lib/skynet/skynet_manager.rb
 lib/skynet/skynet_message.rb
 lib/skynet/skynet_message_queue.rb
+lib/skynet/skynet_partitioners.rb
 lib/skynet/skynet_ruby_extensions.rb
 lib/skynet/skynet_task.rb
 lib/skynet/skynet_tuplespace_server.rb
@@ -44,20 +45,20 @@ script/destroy
 script/generate
 script/txt2html
 setup.rb
-sometest.rb
 tasks/deployment.rake
 tasks/environment.rake
 tasks/website.rake
-test/all_models_test.rb
-test/mysql_message_queue_adaptor_test.rb
-test/skynet_manager_test.rb
-test/skynet_message_test.rb
+test/test_active_record_extensions.rb
 test/test_generator_helper.rb
 test/test_helper.rb
+test/test_mysql_message_queue_adapter.rb
 test/test_skynet.rb
 test/test_skynet_install_generator.rb
-test/tuplespace_message_queue_test.rb
-tmtags
+test/test_skynet_job.rb
+test/test_skynet_manager.rb
+test/test_skynet_message.rb
+test/test_skynet_task.rb
+test/test_tuplespace_message_queue.rb
 website/index.html
 website/index.txt
 website/javascripts/rounded_corners_lite.inc.js

data/README.txt

@@ -1,6 +1,6 @@
 Skynet
 	http://skynet.rubyforge.org/
-	by Adam Pisoni
+	by Adam Pisoni and Geni.com
 
 == DESCRIPTION:
 
@@ -8,6 +8,36 @@ Skynet is an open source Ruby implementation of Google's Map/Reduce framework, c
 
 Skynet is an adaptive, self-upgrading, fault-tolerant, and fully distributed system with no single point of failure. It uses a "peer recovery" system where workers watch out for each other. If a worker dies or fails for any reason, another worker will notice and pick up that task. Skynet also has no special 'master' servers, only workers which can act as a master for any task at any time. Even these master tasks can fail and will be picked up by other workers.
 
+== DOCUMENTATION
+
+Feel free to read on if you want more of an overview of Skynet with some specific examples. More specific documentation can be found here:
+
+Skynet::Job - The main interface to Skynet
+
+Skynet::Config - Configuration Options
+
+bin/skynet[link:files/bin/skynet.html] - Starting Skynet
+
+bin/skynet_install[link:files/bin/skynet_install.html] - Installing Skynet into a local project
+
+== Map/Reduce
+
+First of all, Skynet is merely a distributed computing system that allows you to follow the map/reduce steps.  You don't have to use it as a map/reduce framework.  You can use it as a simple distributed system, or even a simple asynchronous processing system.
+
+If you already know what Map/Reduce is, skip this section.                                                             
+
+If you want to know where all this Map/Reduce hype started, you should read Google's paper on it.  http://labs.google.com/papers/mapreduce.html
+
+When I first read that Google paper some years ago, I was a little confused about what all the hypes was.   At the most basic level, it seemed too simple to be revolutionary.  So you've got a job with 3 steps,  you put some data in, it gets split out to a map step run no many machines, the returned data gets reshuffled and parceled out to a reduce step run on many machines.  All the results are then put together again.   You can see it as 5 steps actually.   Data -> Partition -> Map -> Partition -> Reduce.  Simple enough.  Almost too simple.   It was only years later when I began working on Skynet that I realize what the revolutionary part of Google's framwork was.  It made distributed computing accessible.   Any engineer could write a complex distributed system without needing to know about the complexities of such systems.   Also, since the distributed system was generalized, you would only need one class of machines to run ALL of your distributed processing, instead of specialized machines for specialized functions.  THAT was revolutionary.   
+
+There are a number of key differences between Google's MR system and skynet.  Firstly, currently you can not actually send raw code to the workers.  You are really only telling it where the code is.   At first this bothered me a lot.  Then I realized that in most OO systems, the amount of code you'd need duplicate and to send over the wire to every worker could be ridiculous.  For example, if you want to distribute a task you need to run in Rails, you'd have to send almost all of your app and rails to every worker with every chunk of data.  So, even if you COULD send code, you'd probably only be sending code that just called some other code in your system.  If you can't send ALL the code it needs, then you might as well just tell it where the code is.
+
+The second big difference is that Google's MR framework uses Master federater processes to dole out tasks, recombine them, and generally watch the system.  Skynet has not such masters.   Instead Skynet uses a standard message queue for all communication.  That same message queue allows workers to watch each other in the same way a master would, but without the single point of failure (except the queue itself). 
+
+At its simplest level, a single map reduce job defines a data set, a map method and a reduce method. It may also define a partition method. The map/reduce server evenly splits up (partitions) the data given to it and sends those chunks of data, along with a copy of the code in the map method, to workers that execute the map method against the data it was given. The output from each worker is sent back to the map/reduce server. At this point the Mapreduce server evenly partitions the RESULT data returned from the workers and sends those chunks of data along with the reduce code to the workers to be executed. The reducers return the final result which is returned to whomever requested the job be done in the first place. Not all job need a reduce step, some may just have a map step.
+
+The most common example of a mapreduce job is a distributed word counter. Say you wanted to determine how many times a single word appears in a 1GB text file. The map/reduce server would break up the 1GB file into reasonable chunks, say 100 lines per chunk (or partition) and then send each 100 line partition along with the code that looks for that word, to workers. Each worker would grab its partition of the data, count how many times the word appears in the data and return that number. It might take dozens of workers to complete the task. When the map step is done, you are left with a huge list of counts returned by the workers. In this example, the reduce step would involve sending that list of counts to another worker, with the code required to sum those counts and finally return the total. In this way a task that used to be done in a linear fashion can be parallelized easily.
+
 == INSTALLATION:
 
 Skynet can be installed via RubyGems:
@@ -15,6 +45,7 @@ Skynet can be installed via RubyGems:
   $ sudo gem install skynet
 
 == GETTING STARTED
+
 Skynet works by putting "tasks" on a message queue which are picked up by skynet workers, who execute the tasks, then put their results back on the message queue.   Skynet works best when it runs with your code.  For example, you might have a rails app and want some code you've already written to run asynchronously or in a distributed way.   Skynet can run within your code by installing a skynet launcher into your app.   Running this skynet launcher within your app guarantees all skynet workers will have access to your code.   This will be covered later.
 
 Skynet currently supports 2 message queue systems, TupleSpace and Mysql.   By default, the TupleSpace queue is used as it is the easiest to set up, though it is less powerful and less scaleable for large installations.  
@@ -24,11 +55,16 @@ Since Skynet is a distributed system, it requires you have a skynet message queu
 
   $ skynet
 
-This starts a skynet tuple space message queue and 4 workers.   You can now run the Skynet Console to play with skynet a little.
+This starts a skynet tuple space message queue and 4 workers.   You can now run the skynet console to play with skynet a little.  See Skynet::ConsoleHelper for commands.
 
-  $ skynet_console
+  $ skynet console
+  
+For help try:
+  $ skynet --help
+or
+  $ skynet console --help
 
-Here are some commands you can run.  
+Here are some commands you can run in the skynet console.
   > stats
   > manager.worker_pids
   > [1,2,3,1,1,4].mapreduce(Skynet::MapreduceTest)
@@ -44,7 +80,7 @@ To be really useful, you'll want to run skynet in your own application.   To do
 If you pass --rails it will assume it is installing in a rails app.   Once it is installed in your application, you can run skynet with
 
   $ ./script/skynet
-  $ ./script/skynet_console
+  $ ./script/skynet console
 
 == USAGE:
 
@@ -69,10 +105,41 @@ In the second example, once the objects of YourModel are distributed, each worke
   
 Sometimes you have a method you want to call on a model asynchronously.  Using :send_later you can call a method, pass it options, and decide whether you want Skynet to save that model or not once its done calling your method.
 
-== EXAMPLES:
+== Creating Skynet Jobs
 
-== LIMITATIONS:
+The main interface to Skynet is through Skynet::AsyncJob or Skynet::Job
+
+  job = Skynet::AsyncJob.new(options)
+  job.run_master
+  
+There are many options you can pass or change once you have a job object.  See Skynet::Job for more info.
   
+Most of the time, you will only need to pass a map_reduce_class and map_data.  All other options just give you finer grain control.   map_data must be an array.   The map_reduce_class must AT LEAST implement a self.map class method.  It may also implement self.reduce, self.reduce_partitioner, and self.map_partitioner.  Skynet will assume it can use all of those methods in the map_reduce_class you pass.
+
+Your map and reduce class methods should ALWAYS assume they are being passed an array.  Your map method must always return an array as well.
+
+== CREDITS
+There are a number of people who either directly or indirectly worked on Skynet.
+John Beppu (wrote the original worker/manager code)
+Justin Balthrop
+Zack Parker
+Amos Elliston
+Zack Hobson
+Alan Braverman
+Mike Stangel
+Scott Steadman
+Andrew Arrow
+Jason Rojas
+
+Skynet was inspired by and heavily influenced by Josh Carter and this blog post.
+http://multipart-mixed.com/software/simple_mapreduce_in_ruby.html
+
+Also by Starfish by Lucas Carlson
+http://tech.rufy.com/2006/08/mapreduce-for-ruby-ridiculously-easy.html
+http://rufy.com/starfish/doc/
+
+== CONTACT:
+  Adam Pisoni, Geni.com (apisoni at geni.com)
 
 == LICENSE:
 

data/app_generators/skynet_install/skynet_install_generator.rb

@@ -3,13 +3,12 @@ class SkynetInstallGenerator < RubiGen::Base
   DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
                               Config::CONFIG['ruby_install_name'])
   
-  default_options :author             => nil
-  default_options :in_rails           => nil
-  default_options :include_migration  => false
+  default_options :in_rails => false
+  default_options :mysql    => false
   
   attr_reader :name
   attr_reader :in_rails
-  attr_reader :include_migration
+  attr_reader :mysql
   
   def initialize(runtime_args, runtime_options = {})
     super
@@ -26,17 +25,16 @@ class SkynetInstallGenerator < RubiGen::Base
       BASEDIRS.each { |path| m.directory path }
       
       # Create stubs
-      # m.template "template.rb",  "some_file_after_erb.rb"
-      m.template     "skynet",         "script/skynet", :assigns => {:rails => @rails}, :collision => :ask, :chmod => 0755, :shebang => options[:shebang]
-      m.template     "skynet_console", "script/skynet_console", :assigns => {:rails => @rails}, :collision => :ask, :chmod => 0755, :shebang => options[:shebang]
-      if include_migration
+      m.template     "skynet",         "script/skynet", :collision => :ask, :chmod => 0775, :shebang => options[:shebang]
+      if @mysql
+        m.template   "skynet_schema.sql", "db/skynet_schema.sql", :collision => :ask, :chmod => 0655
         m.directory 'db/migrate'
-        m.migration_template "migration.rb", "db/migrate", :collision => :skip, :assigns => {
+        m.migration_template "migration.rb", "db/migrate", 
+          :collision => :ask, 
+          :assigns => {
               :migration_name => "CreateSkynetTables"
           },  :migration_file_name => "create_skynet_tables"
       end
-      # m.dependency "install_rubigen_scripts", [destination_root, 'skynet_install'], 
-      #   :shebang => options[:shebang], :collision => :force
     end
   end
 
@@ -45,7 +43,9 @@ class SkynetInstallGenerator < RubiGen::Base
       <<-EOS
 Creates a ...
 
-USAGE: #{spec.name} [--rails] directory (can be '.' for current)"
+USAGE: #{spec.name} [--rails] [--mysql] directory (can be '.' for current)"
+Installs: 
+  ./script/skynet
 EOS
     end
 
@@ -54,31 +54,35 @@ EOS
       opts.separator 'Options:'
       # For each option below, place the default
       # at the top of the file next to "default_options"
-      # opts.on("-a", "--author=\"Your Name\"", String,
-      #         "Some comment about this option",
-      #         "Default: none") { |options[:author]| }
       opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
-      opts.on("--include-migration", 
-             "Include mysql migration if you want to use mysql as your message queue") { |options[:include_migration]| }
+      opts.on("--mysql", 
+             "Include mysql migration if you want to use mysql as your message queue.  
+             Installs:
+             ./db/skynet_schema.sql
+             ./db/migrate/db/migrate/###_create_skynet_tables.rb
+             ") do |mysql|
+               options[:mysql] = true if mysql
+             end
       opts.on("-r", "--rails",
               "Install into rails app",
-              "Default: false") { |options[:rails]| }
+              "Default: false") do |rails| 
+                options[:rails] = true if rails
+              end
     end
     
     def extract_options
       # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
       # Templates can access these value via the attr_reader-generated methods, but not the
       # raw instance variable value.
-      # @author = options[:author]
-      @in_rails       = options[:rails]
-      @include_migration = options[:include_migration]
+      @in_rails = options[:rails]
+      @mysql    = options[:mysql]
     end
 
     # Installation skeleton.  Intermediate directories are automatically
     # created so don't sweat their absence here.
     BASEDIRS = %w(
+      db
       log
       script
-      db/migrate
     )
 end

data/app_generators/skynet_install/templates/migration.rb

@@ -2,6 +2,7 @@ class <%= migration_name %> < ActiveRecord::Migration
   def self.up
     create_table :skynet_worker_queues do |t|
       t.column  :id,            "bigint unsigned primary key"
+      t.column  :queue_id,      :integer, :default => 0      
       t.column  :created_on,    :timestamp
       t.column  :updated_on,    :timestamp
       t.column  :tasktype,      :string
@@ -21,6 +22,8 @@ class <%= migration_name %> < ActiveRecord::Migration
     end                                 
     create_table :skynet_message_queues do |t|
       t.column  :id,            "bigint unsigned primary key"
+      t.column  :queue_id,      :integer, :default => 0
+      t.column  :tran_id,       "bigint unsigned"
       t.column  :created_on,    :timestamp
       t.column  :updated_on,    :timestamp
       t.column  :tasktype,      :string
@@ -34,22 +37,25 @@ class <%= migration_name %> < ActiveRecord::Migration
       t.column  :iteration,     :integer
       t.column  :version,       :integer
       t.column  :timeout,       "decimal(16,4)"
+      t.column  :retry,         :integer, :default => 0
     end                                   
     create_table :skynet_queue_temperature do |t|
       t.column  :id,            "bigint unsigned primary key"
+      t.column  :queue_id,      :integer, :default => 0      
       t.column  :updated_on,    :timestamp
       t.column  :count,         :integer, :default => 0
       t.column  :temperature,   "decimal(6,4) default 1"
       t.column  :type,          :string
     end
-    add_index :skynet_message_queues, [:job_id]
+    add_index :skynet_message_queues, :job_id
     add_index :skynet_message_queues, :task_id
-    add_index :skynet_message_queues, [:tasktype,:payload_type,:expire_time], :name => "index_skynet_mqueue_for_take"
+    add_index :skynet_message_queues, :tran_id, :unique => true
+    add_index :skynet_message_queues, [:queue_id,:tasktype,:payload_type,:expire_time], :name => "index_skynet_mqueue_for_take"
     add_index :skynet_worker_queues, [:hostname, :process_id]
     add_index :skynet_worker_queues, :worker_id, :unique=> true
-    execute "insert into skynet_queue_temperature (type) values ('master')"
-    execute "insert into skynet_queue_temperature (type) values ('any')"
-    execute "insert into skynet_queue_temperature (type) values ('task')"
+    execute "insert into skynet_queue_temperature (queue_id,type) values (0,'master')"
+    execute "insert into skynet_queue_temperature (queue_id,type) values (0,'any')"
+    execute "insert into skynet_queue_temperature (queue_id,type) values (0,'task')"
   end
 
   def self.down

data/app_generators/skynet_install/templates/skynet

@@ -1,22 +1,35 @@
 #!/usr/bin/env ruby
 
-<% if in_rails %>
+<% if in_rails -%>
+# Load your rails app
 require File.dirname(__FILE__) + '/../config/boot'
 require File.expand_path(File.dirname(__FILE__)) + '/../config/environment'
-<% end %>
+<% end -%>
 
+require 'rubygems'
 require 'skynet'         
 
 Skynet::CONFIG[:LAUNCHER_PATH]      = File.expand_path(__FILE__)
-Skynet::CONFIG[:SKYNET_LOG_FILE]    = Logger::ERROR
-Skynet::CONFIG[:SKYNET_LOG_LEVEL]   = Logger::ERROR
-<% if in_rails %>
-Skynet::CONFIG[:SKYNET_PIDS_FILE]   = File.expand_path("../log/skynet.pid"),
-Skynet::CONFIG[:SKYNET_LOG_FILE]    = File.expand_path("../log/skynet.log"),
-<% else %>
-Skynet::CONFIG[:SKYNET_PIDS_FILE]   = File.expand_path("#{RAILS_ROOT}/log/skynet_#{RAILS_ENV}.pid"),
-Skynet::CONFIG[:SKYNET_LOG_FILE]    = File.expand_path("#{RAILS_ROOT}/log/skynet_#{RAILS_ENV}.log"),
-<% end %>
+Skynet::CONFIG[:SKYNET_LOG_FILE]    ||= STDERR
+Skynet::CONFIG[:SKYNET_LOG_LEVEL]   ||= Logger::ERROR
+<% if in_rails -%>
+Skynet::CONFIG[:SKYNET_PIDS_FILE]   ||= File.expand_path("#{RAILS_ROOT}/log/skynet_#{RAILS_ENV}.pid")
+Skynet::CONFIG[:SKYNET_LOG_FILE]    ||= File.expand_path("#{RAILS_ROOT}/log/skynet_#{RAILS_ENV}.log")
+<% else -%>
+Skynet::CONFIG[:SKYNET_PIDS_FILE]   ||= File.expand_path("../log/skynet.pid")
+Skynet::CONFIG[:SKYNET_LOG_FILE]    ||= File.expand_path("../log/skynet.log")
+<% end -%>
+
+<% if mysql -%>
+# Use the mysql message queue adapter
+Skynet::CONFIG[:MESSAGE_QUEUE_ADAPTER] = "Skynet::MessageQueueAdapter::Mysql"
+<% if not in_rails -%>
+Skynet::CONFIG[:MYSQL_HOST]            = "localhost"
+Skynet::CONFIG[:MYSQL_USERNAME]        = "root"
+Skynet::CONFIG[:MYSQL_PASSWORD]        = ""
+Skynet::CONFIG[:MYSQL_DATABASE]        = "skynet"
+<% end -%>
+<% end -%>
 
 begin
   mq = Skynet::MessageQueue.new
@@ -25,7 +38,7 @@ rescue Skynet::ConnectionError
     pid = fork do
       exec("skynet_tuplespace_server start")
     end
-    sleep 3
+    sleep Skynet::CONFIG[:TS_SERVER_START_DELAY]
   end
 end