1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Fixed a problem with calling isyslog() from within the SignalHandler()

This commit is contained in:
Klaus Schmidinger 2008-09-06 11:26:01 +02:00
parent 4844235c77
commit 4f9b3175d0
3 changed files with 9 additions and 3 deletions

View File

@ -1585,6 +1585,7 @@ Udo Richter <udo_richter@gmx.de>
for making housekeeping wait for a while after a replay has ended for making housekeeping wait for a while after a replay has ended
for fixing error handling in cCuttingThread::Action() for fixing error handling in cCuttingThread::Action()
for suppressing the automatic shutdown if the remote control is currently disabled for suppressing the automatic shutdown if the remote control is currently disabled
for fixing a problem with calling isyslog() from within the SignalHandler()
Sven Kreiensen <svenk@kammer.uni-hannover.de> Sven Kreiensen <svenk@kammer.uni-hannover.de>
for his help in keeping 'channels.conf.terr' up to date for his help in keeping 'channels.conf.terr' up to date

View File

@ -5806,6 +5806,8 @@ Video Disk Recorder Revision History
now follows the VPID and optional PPID, separated by an '=' sign. now follows the VPID and optional PPID, separated by an '=' sign.
- Updated the sources.conf file (thanks to Oleg Roitburd). - Updated the sources.conf file (thanks to Oleg Roitburd).
- Fixed a possible integer overflow in GetAbsTime() (thanks to Alexander Rieger). - Fixed a possible integer overflow in GetAbsTime() (thanks to Alexander Rieger).
- Fixed a problem with calling isyslog() from within the SignalHandler() (thanks
to Udo Richter).
2008-09-06: Version 1.6.0-2 2008-09-06: Version 1.6.0-2
@ -5818,3 +5820,5 @@ Video Disk Recorder Revision History
fontconfig (suggested by Edgar Toernig). fontconfig (suggested by Edgar Toernig).
- Updated the sources.conf file (thanks to Oleg Roitburd). - Updated the sources.conf file (thanks to Oleg Roitburd).
- Fixed a possible integer overflow in GetAbsTime() (thanks to Alexander Rieger). - Fixed a possible integer overflow in GetAbsTime() (thanks to Alexander Rieger).
- Fixed a problem with calling isyslog() from within the SignalHandler() (thanks
to Udo Richter).

7
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/vdr * The project's page is at http://www.cadsoft.de/vdr
* *
* $Id: vdr.c 2.1 2008/05/03 10:16:41 kls Exp $ * $Id: vdr.c 2.2 2008/09/06 11:24:21 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -141,7 +141,6 @@ static bool SetKeepCaps(bool On)
static void SignalHandler(int signum) static void SignalHandler(int signum)
{ {
isyslog("caught signal %d", signum);
switch (signum) { switch (signum) {
case SIGPIPE: case SIGPIPE:
break; break;
@ -1285,9 +1284,11 @@ Exit:
ReportEpgBugFixStats(); ReportEpgBugFixStats();
if (WatchdogTimeout > 0) if (WatchdogTimeout > 0)
dsyslog("max. latency time %d seconds", MaxLatencyTime); dsyslog("max. latency time %d seconds", MaxLatencyTime);
isyslog("exiting, exit code %d", ShutdownHandler.GetExitCode()); if (LastSignal)
isyslog("caught signal %d", LastSignal);
if (ShutdownHandler.EmergencyExitRequested()) if (ShutdownHandler.EmergencyExitRequested())
esyslog("emergency exit!"); esyslog("emergency exit!");
isyslog("exiting, exit code %d", ShutdownHandler.GetExitCode());
if (SysLogLevel > 0) if (SysLogLevel > 0)
closelog(); closelog();
if (HasStdin) if (HasStdin)