Add option to change not only directory but also filename.

For now, after daemonized, create ${pid_dir}/${pid_file} to record
current process ID.  (default: /var/run/keitairc.pid)

diff --git a/ChangeLog b/ChangeLog
index 94bcbeb..b8144d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
        lib/plugins/00all, lib/plugins/00recent, lib/plugins/00unread: \e$B%A%c\e(B
        \e$B%s%M%k$NFbMFI=<($N:]!$@5=g$KI=<($9$k$?$a$N%*%W%7%g%s$rDI2C\e(B
        (thanks to Takahashi Yoshihiro)\e$B!%\e(B Closes #11019.
+       * keitairc, etc/dot.keitairc, lib/Keitairc/Config.pm: daemonize\e$B$7\e(B
+       \e$B$?8e$N\e(Bpid\e$B%U%!%$%kL>$rJQ99$9$k%*%W%7%g%s$rDI2C!%\e(B Closes #12449.
        
 2008-03-15  Jun Morimoto  <morimoto@mrmt.net>
 

diff --git a/etc/dot.keitairc b/etc/dot.keitairc
index 3db6412..402d3e9 100644 (file)
--- a/etc/dot.keitairc
+++ b/etc/dot.keitairc
@@ -1,7 +1,7 @@
 #
 # sample ~/.keitairc for keitairc 2.x
 #
-# $Id: dot.keitairc,v 1.7 2008-05-02 14:31:12 matusita Exp $
+# $Id: dot.keitairc,v 1.8 2008-05-02 14:40:27 matusita Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/etc/dot.keitairc,v $
 
 ################################################################
@@ -85,9 +85,10 @@ web_password = 1234
 # Set to 1 if you wanna daemonize keitairc.
 # daemonize = 1
 
-# After daemonized, keitairc writes pid to $pid_dir/keitairc.pid.
-# Set to /var/run by default.
+# After daemonized, keitairc writes pid to $pid_dir/$pid_file.
+# Set to /var/run/keitairc.pid by default.
 # pid_dir = /var/run
+# pid_file = keitairc.pid
 
 # Verbose logging
 # debug = 1

diff --git a/keitairc b/keitairc
index 6e3d80a..f6768df 100755 (executable)
--- a/keitairc
+++ b/keitairc
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # keitairc
-# $Id: keitairc,v 1.46 2008-05-02 14:31:12 matusita Exp $
+# $Id: keitairc,v 1.47 2008-05-02 14:40:27 matusita Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/keitairc,v $
 #
 # Copyright (c) 2003-2008 Jun Morimoto <morimoto@mrmt.net>
@@ -38,7 +38,7 @@ our $pl = new Keitairc::Plugins({config => $cf});
 if($cf->daemonize()){
        Proc::Daemon::Init;
        if(length $cf->pid_dir()){
-               if (open(PID, '> ' . $cf->pid_dir() . '/keitairc.pid')) {
+               if (open(PID, '> ' . $cf->pid_dir() . '/' . $cf->pid_file())) {
                        print PID $$, "\n";
                        close(PID);
                }

diff --git a/lib/Keitairc/Config.pm b/lib/Keitairc/Config.pm
index a8cd56c..4aacdc5 100644 (file)
--- a/lib/Keitairc/Config.pm
+++ b/lib/Keitairc/Config.pm
@@ -1,6 +1,6 @@
 # -*-perl-*-
 # Keitairc::Config
-# $Id: Config.pm,v 1.8 2008-05-02 14:31:12 matusita Exp $
+# $Id: Config.pm,v 1.9 2008-05-02 14:40:27 matusita Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/Keitairc/Config.pm,v $
 #
 # Copyright (c) 2008 Jun Morimoto <morimoto@mrmt.net>
@@ -33,7 +33,7 @@ sub new{
                   web_username web_password web_host
                   show_newmsgonly ping_delay reconnect_delay
                   smtp_server smtp_from smtp_to debug
-                  template_dir version daemonize pid_dir plugin_dir
+                  template_dir version daemonize pid_dir pid_file plugin_dir
                   reverse_message reverse_recent reverse_unread)
                );
 
@@ -50,6 +50,7 @@ sub new{
        $me->cookie_ttl(86400 * 3);  # 3 days
        $me->session_ttl(60 * 30);  # 30 min
        $me->pid_dir('/var/run');
+       $me->pid_file('keitairc.pid');
        $me->plugin_dir(getcwd() . '/lib/plugins:/usr/share/keitairc/lib/plugins');
        $me->template_dir(getcwd() . '/lib/templates:/usr/share/keitairc/lib/templates');
        $me->reverse_message(1);