Fix up the skynet script that installs with skynet_install. Make sure…

… it puts the log and pid file in the right place.
wonko9 · Apr 11, 2008 · d759a33 · d759a33
1 parent 0641472
commit d759a33
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/app_generators/skynet_install/templates/skynet b/app_generators/skynet_install/templates/skynet
@@ -2,22 +2,21 @@
 
 <% if in_rails -%>
 # Load your rails app
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path(File.dirname(__FILE__) + '/../config/boot')
 require File.expand_path(File.dirname(__FILE__)) + '/../config/environment'
 <% end -%>
 
 require 'rubygems'
 require 'skynet'         
 
 Skynet::CONFIG[:LAUNCHER_PATH]      = File.expand_path(__FILE__)
-Skynet::CONFIG[:SKYNET_LOG_FILE]    ||= STDERR
-Skynet::CONFIG[:SKYNET_LOG_LEVEL]   ||= Logger::ERROR
+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")
+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")
+Skynet::CONFIG[:SKYNET_PIDS_FILE]   = File.expand_path(File.dirname(__FILE__) + "/../log/skynet.pid")
+Skynet::CONFIG[:SKYNET_LOG_FILE]    = File.expand_path(File.dirname(__FILE__) + "/../log/skynet.log")
 <% end -%>
 
 <% if mysql -%>

diff --git a/lib/skynet/skynet_console_helper.rb b/lib/skynet/skynet_console_helper.rb
@@ -1,6 +1,10 @@
 module Skynet::ConsoleHelper
 # All of these commands can be run at the 'skynet console'.
 
+    def log
+      Skynet::Logger.get
+    end
+
     def mq
       @mq ||= Skynet::MessageQueue.new
     end                       

diff --git a/lib/skynet/skynet_logger.rb b/lib/skynet/skynet_logger.rb
@@ -25,7 +25,13 @@ def self.get
     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