X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep.c;h=2625d615d2fd5ab38c9a6beaae2ec53084a53d29;hb=496debf89657e8b2d09b60b8595d7046f494ad62;hp=a935c410b00cb38125697616b80fa8fc21467ab9;hpb=5ad958794fb683b377b8c317219f3e473b4befb8;p=citadel.git

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index a935c410b..2625d615d 100644
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -130,7 +130,7 @@ void vCtdlLogPrintf(enum LogLevel loglevel, const char *format, va_list arg_ptr)
 			node = cTSD->self;
 		if ((node != NULL) && (node->reltid != 0))
 		{
-			lwpid = node->pid + node->reltid;
+			lwpid = node->reltid;
 		}
 
 		gettimeofday(&tv, NULL);
@@ -138,7 +138,7 @@ void vCtdlLogPrintf(enum LogLevel loglevel, const char *format, va_list arg_ptr)
 		unixtime = tv.tv_sec;
 		localtime_r(&unixtime, &tim);
 
-		if (CCC != NULL)
+		if ((CCC != NULL) && (CCC != &masterCC))
 			lBuf = CCC->lBuf;
 		else 
 			lBuf = NewStrBuf();
@@ -161,7 +161,7 @@ void vCtdlLogPrintf(enum LogLevel loglevel, const char *format, va_list arg_ptr)
 			}
 			vsnprintf(buf2, SIZ, format, arg_ptr);   
 
-			fprintf(stderr, "%s%s", buf, buf2);
+			fprintf(stderr, ":%s%s", buf, buf2);
 		}
 		else {
 			StrBufPrintf(lBuf,
@@ -1362,6 +1362,10 @@ void *select_on_master (void *arg)
 	int m;
 	int i;
 	int retval;
+	struct CitContext select_on_master_CC;
+
+	CtdlFillSystemContext(&select_on_master_CC, "select_on_master");
+	citthread_setspecific(MyConKey, (void *)&select_on_master_CC);
 
 	while (!CtdlThreadCheckStop()) {
 		/* Initialize the fdset. */
@@ -1465,6 +1469,8 @@ void *select_on_master (void *arg)
 			}
 		}
 	}
+	CtdlClearSystemContext();
+
 	return NULL;
 }