From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 31 May 2016 17:42:28 +0000 (-0400)
Subject: Exit with keep-alive instead of doing a in-place restart when on-demand
X-Git-Tag: v2.2b1~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83d8789dc682efb07c795d1123386935ca3b00cd;p=thirdparty%2Fcups.git

Exit with keep-alive instead of doing a in-place restart when on-demand
launching is in use (Issue #4760)
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 3fe44e5f63..e3126c017e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,9 +1,10 @@
-CHANGES.txt - 2.2b1 - 2016-05-25
+CHANGES.txt - 2.2b1 - 2016-05-31
 --------------------------------
 
 CHANGES IN CUPS V2.2b1
 
 	- All CUPS commands now support POSIX options (Issue #4813)
+	- The scheduler now restarts faster (Issue #4760)
 	- Improved performance of web interface with large numbers of jobs
 	  (Issue #3819)
 	- Encrypted printing can now be limited to only trusted printers and
diff --git a/scheduler/main.c b/scheduler/main.c
index f9b46bad6e..cb311beb73 100644
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -754,6 +754,11 @@ main(int  argc,				/* I - Number of command-line args */
 	* Shutdown the server...
 	*/
 
+#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
+	if (OnDemand)
+	  break;
+#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
+
         DoingShutdown = 1;
 
 	cupsdStopServer();
@@ -2159,6 +2164,7 @@ service_checkout(void)
 
   if (cupsArrayCount(ActiveJobs) ||	/* Active jobs */
       WebInterface ||			/* Web interface enabled */
+      NeedReload ||			/* Doing a reload */
       (Browsing && BrowseLocalProtocols && cupsArrayCount(Printers)))
 					/* Printers being shared */
   {