Fixed an issue with DaemonKit.config.pid_file not having a default in…

…stance number, closes #57

lib/daemon_kit/initializer.rb

@@ -334,8 +334,9 @@ def at_shutdown( proc = nil, &block )
       @shutdown_hooks << ( proc || block )
     end
 
-    def pid_file( instance = nil )
-      @pid_file ||= "#{File.dirname(self.log_path)}/#{self.daemon_name}.#{instance}.pid"
+    def pid_file( instance = instance )
+      @pid_file ||=
+        File.join( File.dirname(self.default_log_path), "#{self.daemon_name}.#{instance}.pid" )
     end
 
     def instance
@@ -355,6 +356,10 @@ def run_traps( signal )
       self.signal_traps[ signal ].each { |trap| trap.call }
     end
 
+    def default_log_path
+      File.join(root_path, 'log', "#{environment}.log")
+    end
+
     private
 
     def set_trap( signal )
@@ -412,10 +417,6 @@ def default_load_paths
       [ 'lib' ]
     end
 
-    def default_log_path
-      File.join(root_path, 'log', "#{environment}.log")
-    end
-
     def default_log_level
       environment == 'production' ? :info : :debug
     end

spec/initializer_spec.rb

@@ -68,7 +68,10 @@
   end
 
   it "should have a default pid file" do
-    subject.pid_file.should_not be_nil
+    subject.stub(:default_log_path).and_return('/var/log/daemon.log')
+    subject.stub(:daemon_name).and_return('spec-daemon')
+
+    subject.pid_file.should == "/var/log/spec-daemon.1.pid"
   end
 
   it "should set a default umask" do