Changeset 15791 for trunk/Ohana/src/opihi/pantasks

Timestamp:

Dec 12, 2007, 9:52:11 AM (19 years ago)

Author:

eugene

Message:

adding gprintSetFileAllThreads vs ThisThread

Location:

trunk/Ohana/src/opihi/pantasks

Files:

• ListenClients.c (modified) (2 diffs)
• controller_threads.c (modified) (1 diff)
• input_threads.c (modified) (1 diff)
• job_threads.c (modified) (1 diff)
• pantasks_server.c.in (modified) (1 diff)
• task_threads.c (modified) (1 diff)

trunk/Ohana/src/opihi/pantasks/ListenClients.c

@@ -72 +72 @@
   // 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 +151 @@
         // 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);

trunk/Ohana/src/opihi/pantasks/controller_threads.c

@@ -19 +19 @@
   // 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);
   }
 

trunk/Ohana/src/opihi/pantasks/input_threads.c

@@ -20 +20 @@
   // 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);
   }
 

trunk/Ohana/src/opihi/pantasks/job_threads.c

@@ -21 +21 @@
   // 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);
   }
 

trunk/Ohana/src/opihi/pantasks/pantasks_server.c.in

@@ -29 +29 @@
   // 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);
   }
 

trunk/Ohana/src/opihi/pantasks/task_threads.c

@@ -21 +21 @@
   // 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);
   }