|
 |
f5f232 |
diff -Napur xinetd-2.3.14.old/xinetd/access.c xinetd-2.3.14.new/xinetd/access.c
|
|
|
f5f232 |
--- xinetd-2.3.14.old/xinetd/access.c 2005-10-05 10:15:33.000000000 -0700
|
|
|
f5f232 |
+++ xinetd-2.3.14.new/xinetd/access.c 2012-02-22 20:12:09.120973124 -0800
|
|
|
f5f232 |
@@ -89,9 +89,20 @@ static void cps_service_restart(void)
|
|
|
f5f232 |
msg(LOG_ERR, func,
|
|
|
f5f232 |
"Activating service %s", SC_NAME(scp));
|
|
|
f5f232 |
} else {
|
|
|
f5f232 |
- msg(LOG_ERR, func,
|
|
|
f5f232 |
- "Error activating service %s",
|
|
|
f5f232 |
- SC_NAME(scp)) ;
|
|
|
f5f232 |
+ /* Try to restart the service */
|
|
|
f5f232 |
+ SVC_ATTEMPTS(sp) += 1;
|
|
|
f5f232 |
+ if ( SVC_ATTEMPTS(sp) < MAX_SVC_ATTEMPTS ) {
|
|
|
f5f232 |
+ msg(LOG_ERR, func,
|
|
|
f5f232 |
+ "Error activating service %s, retrying %d more time(s)...",
|
|
|
f5f232 |
+ SC_NAME(scp),
|
|
|
f5f232 |
+ MAX_SVC_ATTEMPTS - SVC_ATTEMPTS(sp));
|
|
|
f5f232 |
+ xtimer_add(cps_service_restart, 1);
|
|
|
f5f232 |
+ } else {
|
|
|
f5f232 |
+ /* Give up */
|
|
|
f5f232 |
+ msg(LOG_ERR, func,
|
|
|
f5f232 |
+ "Error activating service %s",
|
|
|
f5f232 |
+ SC_NAME(scp));
|
|
|
f5f232 |
+ }
|
|
|
f5f232 |
} /* else */
|
|
|
f5f232 |
}
|
|
|
f5f232 |
}
|
|
|
f5f232 |
diff -Napur xinetd-2.3.14.old/xinetd/service.c xinetd-2.3.14.new/xinetd/service.c
|
|
|
f5f232 |
--- xinetd-2.3.14.old/xinetd/service.c 2012-02-22 19:16:56.288912783 -0800
|
|
|
f5f232 |
+++ xinetd-2.3.14.new/xinetd/service.c 2012-02-22 19:25:03.059356909 -0800
|
|
|
f5f232 |
@@ -397,6 +408,7 @@ status_e svc_activate( struct service *s
|
|
|
f5f232 |
* Initialize the service data
|
|
|
f5f232 |
*/
|
|
|
f5f232 |
SVC_RUNNING_SERVERS(sp) = SVC_RETRIES(sp) = 0 ;
|
|
|
f5f232 |
+ SVC_ATTEMPTS(sp) = 0;
|
|
|
f5f232 |
|
|
|
f5f232 |
if ( SC_MUST_LISTEN( scp ) )
|
|
|
f5f232 |
(void) listen( SVC_FD(sp), LISTEN_BACKLOG ) ;
|
|
|
f5f232 |
diff -Napur xinetd-2.3.14.old/xinetd/xconfig.h xinetd-2.3.14.new/xinetd/xconfig.h
|
|
|
f5f232 |
--- xinetd-2.3.14.old/xinetd/xconfig.h 2003-02-19 09:29:28.000000000 -0800
|
|
|
f5f232 |
+++ xinetd-2.3.14.new/xinetd/xconfig.h 2012-02-22 19:20:20.360855514 -0800
|
|
|
f5f232 |
@@ -59,6 +59,12 @@
|
|
|
f5f232 |
#define DEFAULT_LOOP_TIME 10
|
|
|
f5f232 |
|
|
|
f5f232 |
/*
|
|
|
f5f232 |
+ * The number of times to attempt re-activating a service after being
|
|
|
f5f232 |
+ * deactivated due to the above.
|
|
|
f5f232 |
+ */
|
|
|
f5f232 |
+#define MAX_SVC_ATTEMPTS 30
|
|
|
f5f232 |
+
|
|
|
f5f232 |
+/*
|
|
|
f5f232 |
* Signal-to-action mapping
|
|
|
f5f232 |
*/
|
|
|
f5f232 |
#ifndef RECONFIG_HARD_SIG
|