dango 0.3.5 → 0.3.6

data/lib/dango/script/dango_server.rb

@@ -11,29 +11,38 @@ require 'dango/server_framework'
 require RAILS_ROOT + '/config/environment'
 
 class ScriptDangoServer
-	def initialize(config = {}, start_options = {})
-		start_options.each do |k, v|
-			k =~ /\-\-(\w+?):(\w+?)$/
-			key1 = Regexp.last_match(1)
-			key2 = Regexp.last_match(2)
-			if key1 && key2
-				config[key1][key2] = v
-			end
-		end
-		
-		# serverファイル名一覧を取得
-		load_files = []
-		glob_str = 'dango/server/*.rb'
-		Dir.glob(glob_str) do |srv_file|
-			load_files.push({:file=>srv_file, :mtime=>File.mtime(srv_file)})
-		end
-		
-		# ファイル名順にソート
-		load_files = load_files.sort_by{|f| f[:file] }
-		load_files.each do |f|
-			load f[:file]
-		end
-		
-		DangoServer.start(config)
-	end
+  def initialize(config = {}, start_options = {})
+    # コマンドラインオプションでconfigを上書きする
+    start_options.each do |k, v|
+      k =~ /\-\-(\w+?):(\w+?)$/
+      key1 = Regexp.last_match(1)
+      key2 = Regexp.last_match(2)
+      
+      value = v.dup
+      value = true if v == 'true'
+      value = false if v == 'false'
+      
+      if key1 && key2
+        config[key1][key2] = value
+      end
+    end
+    
+    # daemonモードで起動 (nochdir=true)
+    Process.daemon(true) if config['server']['daemon']
+    
+    # serverファイル名一覧を取得
+    load_files = []
+    glob_str = 'dango/server/*.rb'
+    Dir.glob(glob_str) do |srv_file|
+      load_files.push({:file=>srv_file, :mtime=>File.mtime(srv_file)})
+    end
+    
+    # ファイル名順にソート
+    load_files = load_files.sort_by{|f| f[:file] }
+    load_files.each do |f|
+      load f[:file]
+    end
+    
+    DangoServer.start(config)
+  end
 end

data/lib/dango/tasks/dango_rake.rb

@@ -13,7 +13,7 @@ end
 # pid保存ファイルの読み出し
 def get_dango_pid()
   begin
-    pid = open("tmp/pids/dango.pid", "rb"){|fh| fh.read }.to_i
+    pid = open("tmp/pids/dango.#{ENV['RAILS_ENV']}.pid", "rb"){|fh| fh.read }.to_i
   rescue
     pid = nil
   end
@@ -82,7 +82,8 @@ def stop_process(pid)
     end
     
   else ## i386-mswin32以外
-    system("kill -9 #{pid}")
+#    system("kill -9 #{pid}")
+    system("kill #{pid}")
   end
 end
 

data/lib/dango/version.rb

@@ -2,7 +2,7 @@ module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Keisuke Minami
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-28 00:00:00 +09:00
+date: 2008-07-29 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency