<rdar://problem/16041820> Initial edit of a new document on Syrah hangs, apparently...

Increase default idle exit timeout to 60 seconds, as 10 seconds can make launchd
throttle cupsd relaunches.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11585 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index 33442d28ae5f6ea5a9137284c226401cf2662241..047803ccc29f2b89fcc56d31e393f92d1909e26f 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 2.0b1 - 2014-02-11
+CHANGES.txt - 2.0b1 - 2014-02-13
 --------------------------------
 
 CHANGES IN CUPS V2.0b1
@@ -14,4 +14,6 @@ CHANGES IN CUPS V2.0b1
        - cupsRasterInterpretPPD now supports the Orientation header in order to
          support long-edge feed raster printers (<rdar://problem/15837926>)
        - The filter/backend sandbox on OS X now defaults to a more strict
-         whitelist (<rdar://problem/15939788>)
\ No newline at end of file
+         whitelist (<rdar://problem/15939788>)
+       - Increased the default idle exit timeout to 60 seconds on OS X
+         (<rdar://problem/16041820>)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 123f775d6818e0cedf8990959aae4fb6af5b73d0..1e82b229588ec3c93b8cf76201651b61a891ab0f 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -753,7 +753,7 @@ cupsdReadConfiguration(void)
   MaxLeaseDuration           = 0;
 
 #ifdef HAVE_LAUNCHD
-  LaunchdTimeout = 10;
+  LaunchdTimeout = 60;
 #endif /* HAVE_LAUNCHD */
 
  /*

diff --git a/scheduler/conf.h b/scheduler/conf.h
index 9d3caa2c41f1816ca09a63ccf1efc7f4be7665c8..6b43d66c5bed259ced9decadfd4e66f8bf4991e8 100644 (file)
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -244,7 +244,7 @@ VAR char            *ServerKeychain         VALUE(NULL);
 #endif /* HAVE_SSL */
 
 #ifdef HAVE_LAUNCHD
-VAR int                        LaunchdTimeout          VALUE(10);
+VAR int                        LaunchdTimeout          VALUE(60);
                                        /* Time after which an idle cupsd will exit */
 #endif /* HAVE_LAUNCHD */
 

diff --git a/scheduler/main.c b/scheduler/main.c
index 2cd89c996ab129eee6806a2bdc50fdb5ab7fb897..74ee9137e8a9873ee99b61de5232212c51bc53c1 100644 (file)
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -28,15 +28,6 @@
 #  include <libgen.h>
 #  define CUPS_KEEPALIVE CUPS_CACHEDIR "/org.cups.cupsd"
                                        /* Name of the launchd KeepAlive file */
-#  ifndef LAUNCH_JOBKEY_KEEPALIVE
-#    define LAUNCH_JOBKEY_KEEPALIVE "KeepAlive"
-#  endif /* !LAUNCH_JOBKEY_KEEPALIVE */
-#  ifndef LAUNCH_JOBKEY_PATHSTATE
-#    define LAUNCH_JOBKEY_PATHSTATE "PathState"
-#  endif /* !LAUNCH_JOBKEY_PATHSTATE */
-#  ifndef LAUNCH_JOBKEY_SERVICEIPC
-#    define LAUNCH_JOBKEY_SERVICEIPC "ServiceIPC"
-#  endif /* !LAUNCH_JOBKEY_SERVICEIPC */
 #endif /* HAVE_LAUNCH_H */
 
 #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)