mirror of git://git.gnupg.org/gnupg.git
dirmngr: More w32 system daemon cleanup
* dirmngr/dirmngr.c (handle_tick): Remove w32 tests for
shutdown_pending; no longer needed.
--
In d83ba4897b
, we removed the
Windows-specific system daemon features, where shutdown_pending was
set from w32_service_control(). shutdown_pending is now never
assigned outside of handle_signal() or within an inotify test, neither
of which are available on w32.
As a result, this stanza in handle_tick() should be dead code, and can
be removed to keep things simple.
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
s/win32/w32/ to please RMS ;-) -wk
This commit is contained in:
parent
b2e1b17efa
commit
b3a9172012
|
@ -1842,20 +1842,6 @@ time_for_housekeeping_p (time_t curtime)
|
|||
static void
|
||||
handle_tick (void)
|
||||
{
|
||||
/* Under Windows we don't use signals and need a way for the loop to
|
||||
check for the shutdown flag. */
|
||||
#ifdef HAVE_W32_SYSTEM
|
||||
if (shutdown_pending)
|
||||
log_info (_("SIGTERM received - shutting down ...\n"));
|
||||
if (shutdown_pending > 2)
|
||||
{
|
||||
log_info (_("shutdown forced\n"));
|
||||
log_info ("%s %s stopped\n", strusage(11), strusage(13) );
|
||||
cleanup ();
|
||||
dirmngr_exit (0);
|
||||
}
|
||||
#endif /*HAVE_W32_SYSTEM*/
|
||||
|
||||
if (time_for_housekeeping_p (gnupg_get_time ()))
|
||||
{
|
||||
npth_t thread;
|
||||
|
|
Loading…
Reference in New Issue