*
*/
/*
- Copyright (C) 2004-2005 Kern Sibbald
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- version 2 as amended with additional clauses defined in the
- file LICENSE in the main source directory.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- the file LICENSE for additional details.
-
- */
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2004-2006 Free Software Foundation Europe e.V.
+
+ The main author of Bacula is Kern Sibbald, with contributions from
+ many others, a complete list can be found in the file AUTHORS.
+ This program is Free Software; you can redistribute it and/or
+ modify it under the terms of version two of the GNU General Public
+ License as published by the Free Software Foundation plus additions
+ that are listed in the file LICENSE.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ Bacula® is a registered trademark of John Walker.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
#include "bacula.h"
#include "jcr.h"
Dmsg2(050, "watchdog %p term PID %d\n", self, wid->pid);
- /* Kill -TERM the specified PID, and reschedule a -KILL for 3 seconds
- * later.
+ /* Kill -TERM the specified PID, and reschedule a -KILL for 5 seconds
+ * later. (Warning: this should let dvd-writepart enough time to term
+ * and kill growisofs, which takes 3 seconds, so the interval must not
+ * be less than 5 seconds)
*/
kill(wid->pid, SIGTERM);
- self->interval = 3;
+ self->interval = 5;
} else {
/* This is the second call - terminate with prejudice. */
Dmsg2(050, "watchdog %p kill PID %d\n", self, wid->pid);
static void stop_btimer(btimer_t *wid)
{
if (wid == NULL) {
- Emsg0(M_ABORT, 0, "stop_btimer called with NULL btimer_id\n");
+ Emsg0(M_ABORT, 0, _("stop_btimer called with NULL btimer_id\n"));
}
unregister_watchdog(wid->wd);
free(wid->wd);