Index: trunk/Ohana/src/opihi/pantasks/ListenClients.c
===================================================================
--- trunk/Ohana/src/opihi/pantasks/ListenClients.c	(revision 15782)
+++ trunk/Ohana/src/opihi/pantasks/ListenClients.c	(revision 15791)
@@ -72,10 +72,10 @@
   // define server output log files
   if (VarConfig ("PANTASKS_SERVER_STDOUT", "%s", log_stdout) != NULL) {
-    gprintSetFile (GP_LOG, log_stdout);
+    gprintSetFileThisThread (GP_LOG, log_stdout);
   } else {
     strcpy (log_stdout, "stdout");
   }
   if (VarConfig ("PANTASKS_SERVER_STDERR", "%s", log_stderr) != NULL) {
-      gprintSetFile (GP_ERR, log_stderr);
+    gprintSetFileThisThread (GP_ERR, log_stderr);
   } else {
     strcpy (log_stderr, "stderr");
@@ -151,13 +151,21 @@
 	// return the stderr messages first
 	outbuffer = gprintGetBuffer (GP_ERR);
-	SendMessageFixed (clients[i], outbuffer[0].Nbuffer, outbuffer[0].buffer);
+	if (outbuffer) {
+	  SendMessageFixed (clients[i], outbuffer[0].Nbuffer, outbuffer[0].buffer);
+	} else {
+	  SendMessageFixed (clients[i], 0, "");
+	}	  
 
 	// return the stdout messages first
 	outbuffer = gprintGetBuffer (GP_LOG);
-	SendMessageFixed (clients[i], outbuffer[0].Nbuffer, outbuffer[0].buffer);
+	if (outbuffer) {
+	  SendMessageFixed (clients[i], outbuffer[0].Nbuffer, outbuffer[0].buffer);
+	} else {
+	  SendMessageFixed (clients[i], 0, "");
+	}	  
 	
-	/* clear and reset the output buffers */
-	gprintSetFile (GP_LOG, log_stdout);
-	gprintSetFile (GP_ERR, log_stderr);
+	/* clear and reset the output buffers to their last output file names */
+	gprintSetFileAllThreads (GP_LOG, NULL);
+	gprintSetFileAllThreads (GP_ERR, NULL);
       }
       free (line);
Index: trunk/Ohana/src/opihi/pantasks/controller_threads.c
===================================================================
--- trunk/Ohana/src/opihi/pantasks/controller_threads.c	(revision 15782)
+++ trunk/Ohana/src/opihi/pantasks/controller_threads.c	(revision 15791)
@@ -19,8 +19,8 @@
   // define server output log files
   if (VarConfig ("PANTASKS_SERVER_STDOUT", "%s", log_stdout) != NULL) {
-      gprintSetFile (GP_LOG, log_stdout);
+      gprintSetFileThisThread (GP_LOG, log_stdout);
   }
   if (VarConfig ("PANTASKS_SERVER_STDERR", "%s", log_stderr) != NULL) {
-      gprintSetFile (GP_ERR, log_stderr);
+      gprintSetFileThisThread (GP_ERR, log_stderr);
   }
 
Index: trunk/Ohana/src/opihi/pantasks/input_threads.c
===================================================================
--- trunk/Ohana/src/opihi/pantasks/input_threads.c	(revision 15782)
+++ trunk/Ohana/src/opihi/pantasks/input_threads.c	(revision 15791)
@@ -20,8 +20,8 @@
   // define server output log files
   if (VarConfig ("PANTASKS_SERVER_STDOUT", "%s", log_stdout) != NULL) {
-      gprintSetFile (GP_LOG, log_stdout);
+      gprintSetFileThisThread (GP_LOG, log_stdout);
   }
   if (VarConfig ("PANTASKS_SERVER_STDERR", "%s", log_stderr) != NULL) {
-      gprintSetFile (GP_ERR, log_stderr);
+      gprintSetFileThisThread (GP_ERR, log_stderr);
   }
 
Index: trunk/Ohana/src/opihi/pantasks/job_threads.c
===================================================================
--- trunk/Ohana/src/opihi/pantasks/job_threads.c	(revision 15782)
+++ trunk/Ohana/src/opihi/pantasks/job_threads.c	(revision 15791)
@@ -21,8 +21,8 @@
   // define server output log files
   if (VarConfig ("PANTASKS_SERVER_STDOUT", "%s", log_stdout) != NULL) {
-      gprintSetFile (GP_LOG, log_stdout);
+      gprintSetFileThisThread (GP_LOG, log_stdout);
   }
   if (VarConfig ("PANTASKS_SERVER_STDERR", "%s", log_stderr) != NULL) {
-      gprintSetFile (GP_ERR, log_stderr);
+      gprintSetFileThisThread (GP_ERR, log_stderr);
   }
 
Index: trunk/Ohana/src/opihi/pantasks/pantasks_server.c.in
===================================================================
--- trunk/Ohana/src/opihi/pantasks/pantasks_server.c.in	(revision 15782)
+++ trunk/Ohana/src/opihi/pantasks/pantasks_server.c.in	(revision 15791)
@@ -29,8 +29,8 @@
   // define server output log files
   if (VarConfig ("PANTASKS_SERVER_STDOUT", "%s", log_stdout) != NULL) {
-      gprintSetFile (GP_LOG, log_stdout);
+      gprintSetFileThisThread (GP_LOG, log_stdout);
   }
   if (VarConfig ("PANTASKS_SERVER_STDERR", "%s", log_stderr) != NULL) {
-      gprintSetFile (GP_ERR, log_stderr);
+      gprintSetFileThisThread (GP_ERR, log_stderr);
   }
 
Index: trunk/Ohana/src/opihi/pantasks/task_threads.c
===================================================================
--- trunk/Ohana/src/opihi/pantasks/task_threads.c	(revision 15782)
+++ trunk/Ohana/src/opihi/pantasks/task_threads.c	(revision 15791)
@@ -21,8 +21,8 @@
   // define server output log files
   if (VarConfig ("PANTASKS_SERVER_STDOUT", "%s", log_stdout) != NULL) {
-      gprintSetFile (GP_LOG, log_stdout);
+      gprintSetFileThisThread (GP_LOG, log_stdout);
   }
   if (VarConfig ("PANTASKS_SERVER_STDERR", "%s", log_stderr) != NULL) {
-      gprintSetFile (GP_ERR, log_stderr);
+      gprintSetFileThisThread (GP_ERR, log_stderr);
   }