#if defined(AFS_PTHREAD_ENV)
#include <pthread.h>
+static pthread_once_t serverLogOnce = PTHREAD_ONCE_INIT;
static pthread_mutex_t serverLogMutex;
#define LOCK_SERVERLOG() opr_Verify(pthread_mutex_lock(&serverLogMutex) == 0)
#define UNLOCK_SERVERLOG() opr_Verify(pthread_mutex_unlock(&serverLogMutex) == 0)
int LogLevel;
int mrafsStyleLogs = 0;
static int threadIdLogs = 0;
-int printLocks = 0;
static int resetSignals = 0;
-static char ourName[MAXPATHLEN];
+static char *ourName = NULL;
void
SetLogThreadNumProgram(int (*func) (void) )
WriteLogBuffer(char *buf, afs_uint32 len)
{
LOCK_SERVERLOG();
- if (serverLogFD > 0) {
+ if (serverLogFD >= 0) {
if (write(serverLogFD, buf, len) < 0)
; /* don't care */
}
syslog(LOG_INFO, "%s", info);
} else
#endif
- if (serverLogFD > 0) {
+ if (serverLogFD >= 0) {
if (write(serverLogFD, tbuffer, len) < 0)
; /* don't care */
}
threadIdLogs = 0;
#endif
}
- printLocks = 2;
#if defined(AFS_PTHREAD_ENV)
DebugOn((void *)(intptr_t)LogLevel);
#else /* AFS_PTHREAD_ENV */
{
LogLevel = 0;
- if (printLocks > 0)
- --printLocks;
#if defined(AFS_PTHREAD_ENV)
DebugOn((void *)(intptr_t)LogLevel);
#else /* AFS_PTHREAD_ENV */
if (threadIdLogs == 1)
threadIdLogs = 0;
#endif
- if (mrafsStyleLogs)
- OpenLog((char *)&ourName);
+ if (mrafsStyleLogs) {
+ LOCK_SERVERLOG();
+ if (ourName != NULL) {
+ OpenLog(ourName);
+ }
+ UNLOCK_SERVERLOG();
+ }
} /*ResetDebug_Signal */
#endif
}
+#if defined(AFS_PTHREAD_ENV)
+static void
+InitServerLogMutex(void)
+{
+ opr_Verify(pthread_mutex_init(&serverLogMutex, NULL) == 0);
+}
+#endif /* AFS_PTHREAD_ENV */
+
int
OpenLog(const char *fileName)
{
* use stdout/stderr to all go to the same place
*/
int tempfd, isfifo = 0;
- char oldName[MAXPATHLEN];
+ int code;
+ char *nextName = NULL;
struct timeval Start;
struct tm *TimeFields;
- char FileName[MAXPATHLEN];
#ifndef AFS_NT40_ENV
struct stat statbuf;
+#endif
+
+#if defined(AFS_PTHREAD_ENV)
+ opr_Verify(pthread_once(&serverLogOnce, InitServerLogMutex) == 0);
+#endif /* AFS_PTHREAD_ENV */
+#ifndef AFS_NT40_ENV
if (serverLogSyslog) {
openlog(serverLogSyslogTag, LOG_PID, serverLogSyslogFacility);
return (0);
}
+#endif
+ opr_Assert(fileName != NULL);
+
+#ifndef AFS_NT40_ENV
/* Support named pipes as logs by not rotating them */
if ((lstat(fileName, &statbuf) == 0) && (S_ISFIFO(statbuf.st_mode))) {
isfifo = 1;
gettimeofday(&Start, NULL);
t = Start.tv_sec;
TimeFields = localtime(&t);
- if (fileName) {
- if (strncmp(fileName, (char *)&ourName, strlen(fileName)))
- strcpy((char *)&ourName, (char *)fileName);
- }
makefilename:
- snprintf(FileName, MAXPATHLEN, "%s.%d%02d%02d%02d%02d%02d",
- ourName, TimeFields->tm_year + 1900,
+ code = asprintf(&nextName, "%s.%d%02d%02d%02d%02d%02d",
+ fileName, TimeFields->tm_year + 1900,
TimeFields->tm_mon + 1, TimeFields->tm_mday,
TimeFields->tm_hour, TimeFields->tm_min,
TimeFields->tm_sec);
- if(lstat(FileName, &buf) == 0) {
+ if (code < 0) {
+ nextName = NULL;
+ } else if (lstat(nextName, &buf) == 0) {
/* avoid clobbering a log */
TimeFields->tm_sec++;
+ free(nextName);
+ nextName = NULL;
goto makefilename;
}
- if (!isfifo)
- rk_rename(fileName, FileName); /* don't check error code */
- tempfd = open(fileName, O_WRONLY | O_TRUNC | O_CREAT | (isfifo?O_NONBLOCK:0), 0666);
} else {
- strcpy(oldName, fileName);
- strcat(oldName, ".old");
-
- /* don't check error */
+ code = asprintf(&nextName, "%s.old", fileName);
+ if (code < 0) {
+ nextName = NULL;
+ }
+ }
+ if (nextName != NULL) {
if (!isfifo)
- rk_rename(fileName, oldName);
- tempfd = open(fileName, O_WRONLY | O_TRUNC | O_CREAT | O_APPEND | (isfifo?O_NONBLOCK:0), 0666);
+ rk_rename(fileName, nextName); /* Don't check the error code. */
+ free(nextName);
}
+ tempfd = open(fileName, O_WRONLY | O_TRUNC | O_CREAT | O_APPEND | (isfifo?O_NONBLOCK:0), 0666);
if (tempfd < 0) {
printf("Unable to open log file %s\n", fileName);
return -1;
#endif
}
-#if defined(AFS_PTHREAD_ENV)
- opr_Verify(pthread_mutex_init(&serverLogMutex, NULL) == 0);
-#endif /* AFS_PTHREAD_ENV */
+ /* Save our name for reopening. */
+ free(ourName);
+ ourName = strdup(fileName);
+ opr_Assert(ourName != NULL);
serverLogFD = tempfd;
#endif
LOCK_SERVERLOG();
- if (serverLogFD > 0)
+ if (serverLogFD >= 0)
close(serverLogFD);
serverLogFD = open(fileName, O_WRONLY | O_APPEND | O_CREAT | (isfifo?O_NONBLOCK:0), 0666);
- if (serverLogFD > 0) {
+ if (serverLogFD >= 0) {
if (freopen(fileName, "a", stdout) == NULL)
; /* don't care */
if (freopen(fileName, "a", stderr) != NULL) {
#ifdef HAVE_SETVBUF
-#ifdef SETVBUF_REVERSED
- setvbuf(stderr, _IONBF, NULL, 0);
-#else
setvbuf(stderr, NULL, _IONBF, 0);
-#endif
#else
setbuf(stderr, NULL);
#endif
closelog();
} else
#endif
- if (serverLogFD >= 0) {
- close(serverLogFD);
- serverLogFD = -1;
+ {
+ if (serverLogFD >= 0) {
+ close(serverLogFD);
+ serverLogFD = -1;
+ }
+ free(ourName);
+ ourName = NULL;
}
UNLOCK_SERVERLOG();
}