oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

logging cleanups

Browse Source 
* Moved all logging-related stuff into log.c
(and not myfprintf.c)

* ISO C90-compliant strftime usage:
%e and %R replaced with %d and %H:%M respectively

* Got rid of variadic macros since some old-school compilers
don't like them

* compiling with -DNDEBUG disables the DEBUG() macro

git-svn-id: https://svn.musicpd.org/mpd/trunk@4512 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Eric Wong
2006-08-01 04:18:53 +00:00
parent 2532bc36d2
commit 89073cfbba
8 changed files with 225 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/myfprintf.c
View File

@@ -33,12 +33,6 @@
#define BUFFER_LENGTH MAXPATHLEN+1024
static int myfprintf_stdLogMode = 0;
static FILE *myfprintf_out;
static FILE *myfprintf_err;
static char *myfprintf_outFilename;
static char *myfprintf_errFilename;
static void blockingWrite(const int fd, const char *string, size_t len)
{
while (len) {
@@ -62,7 +56,9 @@ void vfdprintf(const int fd, const char *fmt, va_list args)
vsnprintf(buf, BUFFER_LENGTH, fmt, args);
len = strlen(buf);
if (interfacePrintWithFD(fd, buf, len) < 0)
if (fd == STDERR_FILENO ||
fd == STDOUT_FILENO ||
interfacePrintWithFD(fd, buf, len) < 0)
blockingWrite(fd, buf, len);
}
@@ -74,47 +70,3 @@ mpd_fprintf void fdprintf(const int fd, const char *fmt, ...)
va_end(args);
}
void myfprintfStdLogMode(FILE * out, FILE * err)
{
myfprintf_stdLogMode = 1;
myfprintf_out = out;
myfprintf_err = err;
myfprintf_outFilename = parseConfigFilePath(CONF_LOG_FILE, 1)->value;
myfprintf_errFilename = parseConfigFilePath(CONF_ERROR_FILE, 1)->value;
}
int myfprintfCloseAndOpenLogFile(void)
{
if (myfprintf_stdLogMode) {
while (fclose(myfprintf_out) < 0 && errno == EINTR) ;
while (fclose(myfprintf_err) < 0 && errno == EINTR) ;
while ((myfprintf_out =
fopen(myfprintf_outFilename, "a+")) == NULL
&& errno == EINTR) ;
if (!myfprintf_out) {
ERROR("error re-opening log file: %s\n",
myfprintf_outFilename);
return -1;
}
while ((myfprintf_err =
fopen(myfprintf_errFilename, "a+")) == NULL
&& errno == EINTR) ;
if (!myfprintf_err) {
ERROR("error re-opening error file: %s\n",
myfprintf_errFilename);
return -1;
}
while (dup2(fileno(myfprintf_out), 1) < 0 && errno == EINTR) ;
while (dup2(fileno(myfprintf_err), 2) < 0 && errno == EINTR) ;
}
return 0;
}
void myfprintfCloseLogFile(void)
{
if (myfprintf_stdLogMode) {
while (fclose(myfprintf_out) < 0 && errno == EINTR) ;
while (fclose(myfprintf_err) < 0 && errno == EINTR) ;
}
}