[Initng-svn] r3175 - in initng/trunk: initfiles/daemon plugins/daemon

[svn at initng.thinktux.net]

Author: makomk
Date: Thu Mar  2 17:34:10 2006
New Revision: 3175

Modified:
   initng/trunk/initfiles/daemon/agetty.ii
   initng/trunk/initfiles/daemon/fgetty.ii
   initng/trunk/initfiles/daemon/getty.ii
   initng/trunk/initfiles/daemon/mingetty.ii
   initng/trunk/plugins/daemon/initng_daemon.c
Log:
Increase DEFAULT_TERM_TIMEOUT (it's too trigger-happy), and specify lower timeouts 
for the gettys.


Modified: initng/trunk/initfiles/daemon/agetty.ii
==============================================================================
--- initng/trunk/initfiles/daemon/agetty.ii	(original)
+++ initng/trunk/initfiles/daemon/agetty.ii	Thu Mar  2 17:34:10 2006
@@ -1,5 +1,6 @@
 daemon daemon/agetty/1 {
 	need = system/bootmisc;
+	term_timeout = 3;
 	env DEV_PRE=tty;
 	exec daemon = @/sbin/agetty@ 38400 ${DEV_PRE}${NAME};
 	respawn;
@@ -8,6 +9,7 @@
 
 daemon daemon/agetty/* {
 	need = system/bootmisc;
+	term_timeout = 3;
 	env DEV_PRE=tty;
 	exec daemon = @/sbin/agetty@ 38400 ${DEV_PRE}${NAME};
 	respawn;

Modified: initng/trunk/initfiles/daemon/fgetty.ii
==============================================================================
--- initng/trunk/initfiles/daemon/fgetty.ii	(original)
+++ initng/trunk/initfiles/daemon/fgetty.ii	Thu Mar  2 17:34:10 2006
@@ -1,5 +1,6 @@
 daemon daemon/fgetty/1 {
 	need = system/bootmisc;
+	term_timeout = 3;
 	env DEV_PRE=tty;
 	exec daemon = @/sbin/fgetty@ ${DEV_PRE}${NAME};
 	respawn;
@@ -8,6 +9,7 @@
 
 daemon daemon/fgetty/* {
 	need = system/bootmisc;
+	term_timeout = 3;
 	env DEV_PRE=tty;
 	exec daemon = @/sbin/fgetty@ ${DEV_PRE}${NAME};
 	respawn;

Modified: initng/trunk/initfiles/daemon/getty.ii
==============================================================================
--- initng/trunk/initfiles/daemon/getty.ii	(original)
+++ initng/trunk/initfiles/daemon/getty.ii	Thu Mar  2 17:34:10 2006
@@ -1,5 +1,6 @@
 daemon daemon/getty/1 {
 	need = system/bootmisc;
+	term_timeout = 3;
 	env DEV_PRE=tty;
 	exec daemon = @/sbin/getty@ 38400 ${DEV_PRE}${NAME};
 	respawn;
@@ -8,6 +9,7 @@
 
 daemon daemon/getty/* {
 	need = system/bootmisc;
+	term_timeout = 3;
 	env DEV_PRE=tty;
 	exec daemon = @/sbin/getty@ 38400 ${DEV_PRE}${NAME};
 	respawn;

Modified: initng/trunk/initfiles/daemon/mingetty.ii
==============================================================================
--- initng/trunk/initfiles/daemon/mingetty.ii	(original)
+++ initng/trunk/initfiles/daemon/mingetty.ii	Thu Mar  2 17:34:10 2006
@@ -1,5 +1,6 @@
 daemon daemon/mingetty/1 {
 	need = system/bootmisc;
+	term_timeout = 3;
 	env DEV_PRE=tty;
 	exec daemon = @/sbin/mingetty@ ${DEV_PRE}${NAME};
 	respawn;
@@ -8,6 +9,7 @@
 
 daemon daemon/mingetty/* {
 	need = system/bootmisc;
+	term_timeout = 3;
 	env DEV_PRE=tty;
 	exec daemon = @/sbin/mingetty@ ${DEV_PRE}${NAME};
 	respawn;

Modified: initng/trunk/plugins/daemon/initng_daemon.c
==============================================================================
--- initng/trunk/plugins/daemon/initng_daemon.c	(original)
+++ initng/trunk/plugins/daemon/initng_daemon.c	Thu Mar  2 17:34:10 2006
@@ -66,7 +66,7 @@
  * timeout waiting for a pidfile to be created
  * after the daemon returns happily.
  */
-#define PID_TIMEOUT 90
+#define PID_TIMEOUT 60
 
 /*
  * Rate limit on missing pidfile warnings
@@ -84,14 +84,15 @@
 #define DEFAULT_RESPAWN_PAUSE 1
 
 /*
- * Seconds a process have to exit after kill signal sent, before term is sent.
+ * Seconds a process have to exit after term signal sent, before kill is sent.
  */
-#define DEFAULT_KILL_TIMEOUT 2
+#define DEFAULT_TERM_TIMEOUT 30
 
 /*
- * Seconds a process have to exit after term signal sent.
+ * Seconds a process have to exit after kill signal sent before we try and kill it again.
  */
-#define DEFAULT_TERM_TIMEOUT 6
+#define DEFAULT_KILL_TIMEOUT 2
+
 
 /*
  * ############################################################################