brendan-skynet 0.9.3.1

data/lib/skynet/skynet_launcher.rb

@@ -0,0 +1,40 @@
+# FIXME: should be a module
+class Skynet
+  include SkynetDebugger
+  def self.start(options={})
+    begin
+      mq = Skynet::MessageQueue.new
+    rescue Skynet::ConnectionError
+      if Skynet::MessageQueue.adapter == :tuplespace
+        ts_port = Skynet::CONFIG[:TS_SERVER_HOSTS].first.split(':').last
+        # puts "trying to make ts skynet_tuplespace_server --port=#{ts_port} --logfile=#{Skynet.config.logfile_location} --piddir=#{Skynet.config.skynet_pid_dir} --use_ringserver=#{Skynet.config.ts_use_ringserver} --drburi=#{Skynet.config.ts_drburi} start"
+        cmd = "skynet_tuplespace_server  --port=#{ts_port} --logfile=#{Skynet.config.logfile_location} --piddir=#{Skynet.config.skynet_pid_dir} --use_ringserver=#{Skynet.config.ts_use_ringserver} --drburi=#{Skynet.config.ts_drburi} start"
+        pid = fork do
+          exec(cmd)
+        end
+        sleep Skynet::CONFIG[:TS_SERVER_START_DELAY]
+      end
+    end
+
+    options[:script_path] = Skynet::CONFIG[:LAUNCHER_PATH]
+    
+    if ARGV.detect {|a| a == 'console' }
+      ARGV.delete('console')
+      Skynet::Console.start
+    elsif options[:worker_type] or ARGV.detect {|a| a =~ /worker_type/ }
+      Skynet::Worker.start(options)
+    else
+      if ARGV.include?('stop')
+        Skynet::Manager.stop(options)
+      else
+        options["daemonize"] = true if ARGV.include?('start')      
+        Skynet::Manager.start(options)
+      end
+    end
+  end
+
+  def self.new(options={})
+    warn("Skynet.new is deprecated, please use Skynet.start instead")
+    start(options)
+  end
+end

data/lib/skynet/skynet_logger.rb

@@ -0,0 +1,62 @@
+# http://darwinweb.net/article/Undoing_Rails_Monkey_Patch_To_Logger
+
+require 'logger'
+
+class Skynet  
+
+  class Error < StandardError
+  end
+
+  class Logger < ::Logger
+    if respond_to?(:format_message)
+      alias format_message old_format_message
+    end
+    
+    @@log = nil
+    
+    def self.get
+      if not @@log
+        @@log = self.new(Skynet::Config.new.logfile_location)
+        @@log.level = Skynet::CONFIG[:SKYNET_LOG_LEVEL]
+      end  
+      @@log
+    end
+    
+    def self.log=(log)
+      @@log = log
+    end
+
+    def printlog(*args)
+      self.class.get.unknown(*args)
+    end
+
+  end
+  
+    
+  # This module can be mixed in to add logging methods to your class.
+  module Loggable
+    def debug
+      log = Skynet::Logger.get
+    end
+    
+    def info
+      log = Skynet::Logger.get
+    end
+    
+    def warn
+      log = Skynet::Logger.get
+    end
+    
+    def error
+      log = Skynet::Logger.get
+    end
+    
+    def fatal
+      log = Skynet::Logger.get
+    end
+    
+    def unknown
+      log = Skynet::Logger.get
+    end
+  end
+end