/*
* Main loop for the CUPS scheduler.
*
- * Copyright 2007-2016 by Apple Inc.
+ * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law. Distribution and use rights are outlined in the file "LICENSE.txt"
- * "LICENSE" which should have been included with this file. If this
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ * Licensed under Apache License v2.0. See the file "LICENSE" for more
+ * information.
*/
/*
#ifdef HAVE_LAUNCH_H
# include <launch.h>
-# include <libgen.h>
-# define CUPS_KEEPALIVE CUPS_CACHEDIR "/org.cups.cupsd"
- /* Name of the launchd KeepAlive file */
-# ifdef HAVE_LAUNCH_ACTIVATE_SOCKET
-/* Update when we have a public header we can include */
-extern int launch_activate_socket(const char *name, int **fds, size_t *cnt);
-# endif /* HAVE_LAUNCH_ACTIVATE_SOCKET */
#endif /* HAVE_LAUNCH_H */
#ifdef HAVE_SYSTEMD
# include <systemd/sd-daemon.h>
-# define CUPS_KEEPALIVE CUPS_CACHEDIR "/org.cups.cupsd"
- /* Name of the systemd path file */
#endif /* HAVE_SYSTEMD */
+#ifdef HAVE_ONDEMAND
+# define CUPS_KEEPALIVE CUPS_CACHEDIR "/org.cups.cupsd"
+ /* Name of the KeepAlive file */
+#endif /* HAVE_ONDEMAND */
+
#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
# include <malloc.h>
#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
static void sighup_handler(int sig);
static void sigterm_handler(int sig);
static long select_timeout(int fds);
-#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
static void service_checkin(void);
-static void service_checkout(void);
-#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
+static void service_checkout(int shutdown);
static void usage(int status) __attribute__((noreturn));
/* Dead children? */
static int stop_scheduler = 0;
/* Should the scheduler stop? */
+static time_t local_timeout = 0;
+ /* Next local printer timeout */
/*
#else
time_t netif_time = 0; /* Time since last network update */
#endif /* __APPLE__ */
-#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
+#if defined(HAVE_ONDEMAND)
int service_idle_exit;
/* Idle exit on select timeout? */
-#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
+#endif /* HAVE_ONDEMAND */
#ifdef HAVE_GETEUID
usage(0);
break;
- case 'l' : /* Started by launchd/systemd... */
-#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
+ case 'l' : /* Started by launchd/systemd/upstart... */
+#ifdef HAVE_ONDEMAND
OnDemand = 1;
fg = 1;
close_all = 0;
fg = 0;
disconnect = 1;
close_all = 1;
-#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
+#endif /* HAVE_ONDEMAND */
break;
case 'p' : /* Stop immediately for profiling */
exit(errno);
}
+ /*
+ * Let the system know we are busy while we bring up cupsd...
+ */
+
+ cupsdSetBusyState(1);
+
/*
* Set the timezone info...
*/
cupsdCleanFiles(CacheDir, "*.ipp");
-#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
- if (OnDemand)
- {
- /*
- * If we were started on demand by launchd or systemd get the listen sockets
- * file descriptors...
- */
+ /*
+ * If we were started on demand by launchd or systemd get the listen sockets
+ * file descriptors...
+ */
- service_checkin();
- service_checkout();
- }
-#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
+ service_checkin();
+ service_checkout(0);
/*
* Startup the server...
* Send server-started event...
*/
-#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
+#ifdef HAVE_ONDEMAND
if (OnDemand)
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
else
-#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
+#endif /* HAVE_ONDEMAND */
if (fg)
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
else
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in background.");
+ cupsdSetBusyState(0);
+
/*
* Start any pending print jobs...
*/
current_time = time(NULL);
event_time = current_time;
expire_time = current_time;
+ local_timeout = 0;
fds = 1;
report_time = 0;
senddoc_time = current_time;
* Shutdown the server...
*/
+#ifdef HAVE_ONDEMAND
+ if (OnDemand)
+ break;
+#endif /* HAVE_ONDEMAND */
+
DoingShutdown = 1;
cupsdStopServer();
if (!cupsdReadConfiguration())
{
-#ifdef HAVE_ASL_H
- asl_object_t m; /* Log message */
-
- m = asl_new(ASL_TYPE_MSG);
- asl_set(m, ASL_KEY_FACILITY, "org.cups.cupsd");
- asl_log(NULL, m, ASL_LEVEL_ERR, "Unable to read configuration file \"%s\" - exiting.", ConfigurationFile);
- asl_release(m);
-#elif defined(HAVE_SYSTEMD_SD_JOURNAL_H)
+#ifdef HAVE_SYSTEMD_SD_JOURNAL_H
sd_journal_print(LOG_ERR, "Unable to read configuration file \"%s\" - exiting.", ConfigurationFile);
#else
syslog(LOG_LPR, "Unable to read configuration file \'%s\' - exiting.", ConfigurationFile);
-#endif /* HAVE_ASL_H */
+#endif /* HAVE_SYSTEMD_SD_JOURNAL_H */
break;
}
if ((timeout = select_timeout(fds)) > 1 && LastEvent)
timeout = 1;
-#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
+#ifdef HAVE_ONDEMAND
/*
* If no other work is scheduled and we're being controlled by
* launchd then timeout after 'LaunchdTimeout' seconds of
}
else
service_idle_exit = 0;
-#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
+#endif /* HAVE_ONDEMAND */
if ((fds = cupsdDoSelect(timeout)) < 0)
{
cupsd_printer_t *p; /* Current printer */
#endif /* HAVE_DNSSD || HAVE_AVAHI */
-
if (errno == EINTR) /* Just interrupted by a signal */
continue;
}
#endif /* !__APPLE__ */
-#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
+#ifdef HAVE_ONDEMAND
/*
- * If no other work was scheduled and we're being controlled by launchd
- * then timeout after 'LaunchdTimeout' seconds of inactivity...
+ * If no other work was scheduled and we're being controlled by launchd,
+ * systemd, or upstart then timeout after 'LaunchdTimeout' seconds of
+ * inactivity...
*/
if (!fds && service_idle_exit)
stop_scheduler = 1;
break;
}
-#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
+#endif /* HAVE_ONDEMAND */
/*
* Resume listening for new connections as needed...
expire_time = current_time;
}
+ /*
+ * Delete stale local printers...
+ */
+
+ if (current_time >= local_timeout)
+ {
+ cupsdDeleteTemporaryPrinters(0);
+ local_timeout = 0;
+ }
+
#ifndef HAVE_AUTHORIZATION_H
/*
* Update the root certificate once every 5 minutes if we have client
cupsdStopServer();
-#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
/*
- * Update the keep-alive file as needed...
+ * Update the KeepAlive/PID file as needed...
*/
- if (OnDemand)
- service_checkout();
-#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
+ service_checkout(1);
/*
* Stop all jobs...
cupsdFreeAllJobs();
+ /*
+ * Delete all temporary printers...
+ */
+
+ cupsdDeleteTemporaryPrinters(1);
+
#ifdef __APPLE__
/*
* Stop monitoring system event monitoring...
time_t now; /* Current time */
cupsd_client_t *con; /* Client information */
cupsd_job_t *job; /* Job information */
+ cupsd_printer_t *printer; /* Printer information */
const char *why; /* Debugging aid */
#ifdef __APPLE__
/*
- * When going to sleep, wake up to cancel jobs that don't complete in time.
+ * When going to sleep, wake up to abort jobs that don't complete in time.
*/
if (SleepJobs > 0 && SleepJobs < timeout)
{
timeout = SleepJobs;
- why = "cancel jobs before sleeping";
+ why = "abort jobs before sleeping";
}
#endif /* __APPLE__ */
}
}
-#ifdef HAVE_MALLINFO
/*
- * Log memory usage every minute...
+ * Check for temporary printers that need to be deleted...
*/
- if (LogLevel >= CUPSD_LOG_DEBUG && (mallinfo_time + 60) < timeout)
+ for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers); printer; printer = (cupsd_printer_t *)cupsArrayNext(Printers))
{
- timeout = mallinfo_time + 60;
- why = "display memory usage";
+ if (printer->temporary && !printer->job && (!local_timeout || local_timeout > (printer->state_time + 60)))
+ local_timeout = printer->state_time + 60;
+ }
+
+ if (timeout > local_timeout && local_timeout)
+ {
+ timeout = local_timeout;
+ why = "delete stale local printers";
}
-#endif /* HAVE_MALLINFO */
/*
* Adjust from absolute to relative time. We add 1 second to the timeout since
}
-#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
+#ifdef HAVE_ONDEMAND
/*
- * 'service_checkin()' - Check-in with launchd and collect the listening fds.
+ * 'service_add_listener()' - Bind an open fd as a Listener.
*/
static void
-service_checkin(void)
+service_add_listener(int fd, /* I - Socket file descriptor */
+ int idx) /* I - Listener number, for logging */
{
-# ifdef HAVE_LAUNCH_ACTIVATE_SOCKET
- int error; /* Check-in error, if any */
- size_t i, /* Looping var */
- count; /* Number of listeners */
- int *ld_sockets; /* Listener sockets */
cupsd_listener_t *lis; /* Listeners array */
http_addr_t addr; /* Address variable */
socklen_t addrlen; /* Length of address */
char s[256]; /* String addresss */
- cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: pid=%d", (int)getpid());
-
- /*
- * Check-in with launchd...
- */
+ addrlen = sizeof(addr);
- if ((error = launch_activate_socket("Listeners", &ld_sockets, &count)) != 0)
+ if (getsockname(fd, (struct sockaddr *)&addr, &addrlen))
{
- cupsdLogMessage(CUPSD_LOG_ERROR, "service_checkin: Unable to get listener sockets: %s", strerror(error));
- exit(EXIT_FAILURE);
- return; /* anti-compiler-warning */
+ cupsdLogMessage(CUPSD_LOG_ERROR, "service_add_listener: Unable to get local address for listener #%d: %s", idx + 1, strerror(errno));
+ return;
}
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "service_add_listener: Listener #%d at fd %d, \"%s\".", idx + 1, fd, httpAddrString(&addr, s, sizeof(s)));
+
/*
- * Try to match the launchd sockets to the cupsd listeners...
+ * Try to match the on-demand socket address to one of the listeners...
*/
- cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: %d listeners.", (int)count);
-
- for (i = 0; i < count; i ++)
- {
- /*
- * Get the launchd socket address...
- */
-
- addrlen = sizeof(addr);
-
- if (getsockname(ld_sockets[i], (struct sockaddr *)&addr, &addrlen))
- {
- cupsdLogMessage(CUPSD_LOG_ERROR, "service_checkin: Unable to get local address for listener #%d: %s", (int)i + 1, strerror(errno));
- continue;
- }
-
- cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: Listener #%d at fd %d, \"%s\".", (int)i + 1, ld_sockets[i], httpAddrString(&addr, s, sizeof(s)));
+ for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
+ lis;
+ lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
+ if (httpAddrEqual(&lis->address, &addr))
+ break;
- for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
- lis;
- lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
- if (httpAddrEqual(&lis->address, &addr))
- break;
+ /*
+ * Add a new listener If there's no match...
+ */
- /*
- * Add a new listener if there's no match...
- */
+ if (lis)
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "service_add_listener: Matched existing listener #%d to %s.", idx + 1, httpAddrString(&(lis->address), s, sizeof(s)));
+ }
+ else
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "service_add_listener: Adding new listener #%d for %s.", idx + 1, httpAddrString(&addr, s, sizeof(s)));
- if (lis)
+ if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
{
- cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: Matched existing listener #%d to %s.", (int)i + 1, httpAddrString(&(lis->address), s, sizeof(s)));
+ cupsdLogMessage(CUPSD_LOG_ERROR, "service_add_listener: Unable to allocate listener: %s.", strerror(errno));
+ exit(EXIT_FAILURE);
+ return;
}
- else
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: Adding new listener #%d for %s.", (int)i + 1, httpAddrString(&addr, s, sizeof(s)));
-
- if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
- {
- cupsdLogMessage(CUPSD_LOG_ERROR, "service_checkin: Unable to allocate listener: %s", strerror(errno));
- exit(EXIT_FAILURE);
- }
-
- cupsArrayAdd(Listeners, lis);
- memcpy(&lis->address, &addr, sizeof(lis->address));
- }
-
- lis->fd = ld_sockets[i];
- lis->on_demand = 1;
+ cupsArrayAdd(Listeners, lis);
-# ifdef HAVE_SSL
- if (httpAddrPort(&(lis->address)) == 443)
- lis->encryption = HTTP_ENCRYPT_ALWAYS;
-# endif /* HAVE_SSL */
+ memcpy(&lis->address, &addr, sizeof(lis->address));
}
- free(ld_sockets);
-
-# elif defined(HAVE_LAUNCHD)
- size_t i, /* Looping var */
- count; /* Number of listeners */
- launch_data_t ld_msg, /* Launch data message */
- ld_resp, /* Launch data response */
- ld_array, /* Launch data array */
- ld_sockets, /* Launch data sockets dictionary */
- tmp; /* Launch data */
- cupsd_listener_t *lis; /* Listeners array */
- http_addr_t addr; /* Address variable */
- socklen_t addrlen; /* Length of address */
- int fd; /* File descriptor */
- char s[256]; /* String addresss */
-
+ lis->fd = fd;
+ lis->on_demand = 1;
- cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: pid=%d", (int)getpid());
+# ifdef HAVE_SSL
+ if (httpAddrPort(&(lis->address)) == 443)
+ lis->encryption = HTTP_ENCRYPT_ALWAYS;
+# endif /* HAVE_SSL */
+}
+#endif /* HAVE_ONDEMAND */
- /*
- * Check-in with launchd...
- */
- ld_msg = launch_data_new_string(LAUNCH_KEY_CHECKIN);
- if ((ld_resp = launch_msg(ld_msg)) == NULL)
- {
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "service_checkin: launch_msg(\"" LAUNCH_KEY_CHECKIN
- "\") IPC failure");
- exit(EXIT_FAILURE);
- return; /* anti-compiler-warning */
- }
-
- if (launch_data_get_type(ld_resp) == LAUNCH_DATA_ERRNO)
- {
- errno = launch_data_get_errno(ld_resp);
- cupsdLogMessage(CUPSD_LOG_ERROR, "service_checkin: Check-in failed: %s",
- strerror(errno));
- exit(EXIT_FAILURE);
- return; /* anti-compiler-warning */
- }
+/*
+ * 'service_checkin()' - Check-in with launchd and collect the listening fds.
+ */
- /*
- * Get the sockets dictionary...
- */
+static void
+service_checkin(void)
+{
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: pid=%d", (int)getpid());
- if ((ld_sockets = launch_data_dict_lookup(ld_resp, LAUNCH_JOBKEY_SOCKETS))
- == NULL)
+#ifdef HAVE_LAUNCHD
+ if (OnDemand)
{
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "service_checkin: No sockets found to answer requests on.");
- exit(EXIT_FAILURE);
- return; /* anti-compiler-warning */
- }
+ int error; /* Check-in error, if any */
+ size_t i, /* Looping var */
+ count; /* Number of listeners */
+ int *ld_sockets; /* Listener sockets */
- /*
- * Get the array of listener sockets...
- */
-
- if ((ld_array = launch_data_dict_lookup(ld_sockets, "Listeners")) == NULL)
- {
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "service_checkin: No sockets found to answer requests on.");
- exit(EXIT_FAILURE);
- return; /* anti-compiler-warning */
- }
+ /*
+ * Check-in with launchd...
+ */
- /*
- * Add listening fd(s) to the Listener array...
- */
+ if ((error = launch_activate_socket("Listeners", &ld_sockets, &count)) != 0)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR, "service_checkin: Unable to get listener sockets: %s", strerror(error));
+ exit(EXIT_FAILURE);
+ return; /* anti-compiler-warning */
+ }
- if (launch_data_get_type(ld_array) == LAUNCH_DATA_ARRAY)
- {
- count = launch_data_array_get_count(ld_array);
+ /*
+ * Try to match the launchd sockets to the cupsd listeners...
+ */
cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: %d listeners.", (int)count);
for (i = 0; i < count; i ++)
- {
- /*
- * Get the launchd file descriptor and address...
- */
-
- if ((tmp = launch_data_array_get_index(ld_array, i)) != NULL)
- {
- fd = launch_data_get_fd(tmp);
- addrlen = sizeof(addr);
+ service_add_listener(ld_sockets[i], (int)i);
- if (getsockname(fd, (struct sockaddr *)&addr, &addrlen))
- {
- cupsdLogMessage(CUPSD_LOG_ERROR, "service_checkin: Unable to get local address for listener #%d: %s", (int)i + 1, strerror(errno));
- continue;
- }
-
- cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: Listener #%d at fd %d, \"%s\".", (int)i + 1, fd, httpAddrString(&addr, s, sizeof(s)));
-
- /*
- * Try to match the launchd socket address to one of the listeners...
- */
-
- for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
- lis;
- lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
- if (httpAddrEqual(&lis->address, &addr))
- break;
-
- /*
- * Add a new listener If there's no match...
- */
-
- if (lis)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: Matched existing listener #%d to %s.", (int)i + 1, httpAddrString(&(lis->address), s, sizeof(s)));
- }
- else
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: Adding new listener #%d for %s.", (int)i + 1, httpAddrString(&addr, s, sizeof(s)));
-
- if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
- {
- cupsdLogMessage(CUPSD_LOG_ERROR, "service_checkin: Unable to allocate listener: %s.", strerror(errno));
- exit(EXIT_FAILURE);
- }
-
- cupsArrayAdd(Listeners, lis);
-
- memcpy(&lis->address, &addr, sizeof(lis->address));
- }
-
- lis->fd = fd;
- lis->on_demand = 1;
-
-# ifdef HAVE_SSL
- if (httpAddrPort(&(lis->address)) == 443)
- lis->encryption = HTTP_ENCRYPT_ALWAYS;
-# endif /* HAVE_SSL */
- }
- }
+ free(ld_sockets);
}
- launch_data_free(ld_msg);
- launch_data_free(ld_resp);
+#elif defined(HAVE_SYSTEMD)
+ if (OnDemand)
+ {
+ int i, /* Looping var */
+ count; /* Number of listeners */
-# else /* HAVE_SYSTEMD */
- int i, /* Looping var */
- count; /* Number of listeners */
- cupsd_listener_t *lis; /* Listeners array */
- http_addr_t addr; /* Address variable */
- socklen_t addrlen; /* Length of address */
- char s[256]; /* String addresss */
+ /*
+ * Check-in with systemd...
+ */
+ if ((count = sd_listen_fds(0)) < 0)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR, "service_checkin: Unable to get listener sockets: %s", strerror(-count));
+ exit(EXIT_FAILURE);
+ return; /* anti-compiler-warning */
+ }
- cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: pid=%d", (int)getpid());
+ /*
+ * Try to match the systemd sockets to the cupsd listeners...
+ */
- /*
- * Check-in with systemd...
- */
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: %d listeners.", count);
- if ((count = sd_listen_fds(0)) < 0)
- {
- cupsdLogMessage(CUPSD_LOG_ERROR, "service_checkin: Unable to get listener sockets: %s", strerror(-count));
- exit(EXIT_FAILURE);
- return; /* anti-compiler-warning */
+ for (i = 0; i < count; i ++)
+ service_add_listener(SD_LISTEN_FDS_START + i, i);
}
- /*
- * Try to match the systemd sockets to the cupsd listeners...
- */
-
- cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: %d listeners.", count);
-
- for (i = 0; i < count; i ++)
+#elif defined(HAVE_UPSTART)
+ if (OnDemand)
{
- /*
- * Get the launchd socket address...
- */
+ const char *e; /* Environment var */
+ int fd; /* File descriptor */
- addrlen = sizeof(addr);
- if (getsockname(SD_LISTEN_FDS_START + i, (struct sockaddr *)&addr, &addrlen))
+ if (!(e = getenv("UPSTART_EVENTS")))
{
- cupsdLogMessage(CUPSD_LOG_ERROR, "service_checkin: Unable to get local address for listener #%d: %s", (int)i + 1, strerror(errno));
- continue;
+ cupsdLogMessage(CUPSD_LOG_ERROR, "service_checkin: We did not get started via Upstart.");
+ exit(EXIT_FAILURE);
+ return;
}
- cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: Listener #%d at fd %d, \"%s\".", (int)i + 1, SD_LISTEN_FDS_START + i, httpAddrString(&addr, s, sizeof(s)));
-
- for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
- lis;
- lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
- if (httpAddrEqual(&lis->address, &addr))
- break;
-
- /*
- * Add a new listener if there's no match...
- */
-
- if (lis)
+ if (strcasecmp(e, "socket"))
{
- cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: Matched existing listener #%d to %s.", (int)i + 1, httpAddrString(&(lis->address), s, sizeof(s)));
+ cupsdLogMessage(CUPSD_LOG_ERROR, "service_checkin: We did not get triggered via an Upstart socket event.");
+ exit(EXIT_FAILURE);
+ return;
}
- else
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: Adding new listener #%d for %s.", (int)i + 1, httpAddrString(&addr, s, sizeof(s)));
- if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
- {
- cupsdLogMessage(CUPSD_LOG_ERROR, "service_checkin: Unable to allocate listener: %s", strerror(errno));
- exit(EXIT_FAILURE);
- }
+ if ((e = getenv("UPSTART_FDS")) == NULL)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR, "service_checkin: Unable to get listener sockets from UPSTART_FDS.");
+ exit(EXIT_FAILURE);
+ return;
+ }
- cupsArrayAdd(Listeners, lis);
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "service_checkin: UPSTART_FDS=%s", e);
- memcpy(&lis->address, &addr, sizeof(lis->address));
+ fd = (int)strtol(e, NULL, 10);
+ if (fd < 0)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR, "service_checkin: Could not parse UPSTART_FDS: %s", strerror(errno));
+ exit(EXIT_FAILURE);
+ return;
}
- lis->fd = SD_LISTEN_FDS_START + i;
- lis->on_demand = 1;
+ /*
+ * Upstart only supportst a single on-demand socket file descriptor...
+ */
-# ifdef HAVE_SSL
- if (httpAddrPort(&(lis->address)) == 443)
- lis->encryption = HTTP_ENCRYPT_ALWAYS;
-# endif /* HAVE_SSL */
+ service_add_listener(fd, 0);
}
-# endif /* HAVE_LAUNCH_ACTIVATE_SOCKET */
+#endif /* HAVE_LAUNCHD */
}
/*
- * 'service_checkout()' - Update the CUPS_KEEPALIVE file as needed.
+ * 'service_checkout()' - Update the KeepAlive/PID file as needed.
*/
static void
-service_checkout(void)
+service_checkout(int shutdown) /* I - Shutting down? */
{
- int fd; /* File descriptor */
+ cups_file_t *fp; /* File */
+ char pidfile[1024]; /* PID/KeepAlive file */
/*
- * Create or remove the "keep-alive" file based on whether there are active
- * jobs or shared printers to advertise...
+ * When running on-demand, use the KeepAlive file, otherwise write a PID file
+ * to StateDir...
*/
- if (cupsArrayCount(ActiveJobs) || /* Active jobs */
- WebInterface || /* Web interface enabled */
- (Browsing && BrowseLocalProtocols && cupsArrayCount(Printers)))
- /* Printers being shared */
+#ifdef HAVE_ONDEMAND
+ if (OnDemand)
{
- cupsdLogMessage(CUPSD_LOG_DEBUG, "Creating keep-alive file \"" CUPS_KEEPALIVE "\".");
+ strlcpy(pidfile, CUPS_KEEPALIVE, sizeof(pidfile));
+
+ if (cupsArrayCount(ActiveJobs) || /* Active jobs */
+ WebInterface || /* Web interface enabled */
+ NeedReload || /* Doing a reload */
+ (Browsing && BrowseLocalProtocols && cupsArrayCount(Printers)))
+ /* Printers being shared */
+ {
+ /*
+ * Create or remove the "keep-alive" file based on whether there are active
+ * jobs or shared printers to advertise...
+ */
- if ((fd = open(CUPS_KEEPALIVE, O_RDONLY | O_CREAT | O_EXCL, S_IRUSR)) >= 0)
- close(fd);
+ shutdown = 0;
+ }
+ }
+ else
+#endif /* HAVE_ONDEMAND */
+ snprintf(pidfile, sizeof(pidfile), "%s/cupsd.pid", StateDir);
+
+ if (shutdown)
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Removing KeepAlive/PID file \"%s\".", pidfile);
+
+ unlink(pidfile);
}
else
{
- cupsdLogMessage(CUPSD_LOG_DEBUG, "Removing keep-alive file \"" CUPS_KEEPALIVE "\".");
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Creating KeepAlive/PID file \"%s\".", pidfile);
- unlink(CUPS_KEEPALIVE);
+ if ((fp = cupsFileOpen(pidfile, "w")) != NULL)
+ {
+ /*
+ * Save the PID in the file...
+ */
+
+ cupsFilePrintf(fp, "%d\n", (int)getpid());
+ cupsFileClose(fp);
+ }
+ else
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create KeepAlive/PID file \"%s\": %s", pidfile, strerror(errno));
}
}
-#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
/*
_cupsLangPuts(fp, _(" -f Run in the foreground."));
_cupsLangPuts(fp, _(" -F Run in the foreground but detach from console."));
_cupsLangPuts(fp, _(" -h Show this usage message."));
+#ifdef HAVE_ONDEMAND
_cupsLangPuts(fp, _(" -l Run cupsd on demand."));
+#endif /* HAVE_ONDEMAND */
_cupsLangPuts(fp, _(" -s cups-files.conf Set cups-files.conf file to use."));
_cupsLangPuts(fp, _(" -t Test the configuration file."));
projects / thirdparty / cups.git / blobdiff