Changeset 6612 for pymolproxy/trunk

Timestamp:

Nov 11, 2016, 2:31:50 AM (8 years ago)

Author:

ldelgass

Message:

Add define to control if pymol stderr is logged, by default discard stderr.

File:

• pymolproxy/trunk/pymolproxy.c (modified) (6 diffs)

pymolproxy/trunk/pymolproxy.c

@@ -109 +109 @@
 #define WRITE_DEBUG 0
 #define EXEC_DEBUG  0
+#define LOG_PYMOL_STDERR 0
 
 #define FORCE_UPDATE            (1<<0)
@@ -2126 +2127 @@
     if (child == 0) {  /* Child process */
         int f;
-        char tmpname[200];
+        char tmpname[BUFSIZ];
 
         /*
@@ -2140 +2141 @@
         dup2(sout[1], 1); /* Server standard output */
 
+#if LOG_PYMOL_STDERR
         /* Redirect child's stderr to a log file. */
-        sprintf(tmpname, "%s/PYMOL-%d-stderr.XXXXXX", LOGDIR, getpid());
-        f = mkstemp(tmpname);
+        sprintf(tmpname, "%s/pymol-%d.stderr", LOGDIR, getpid());
+        f = open(tmpname, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+#else
+        sprintf(tmpname, "/dev/null");
+        /* Discard stderr */
+        f = open(tmpname, O_WRONLY, 0600);
+#endif
         if (f < 0) {
-            ERROR("can't open file `%s' to capture pymol stderr: %s", tmpname,
+            ERROR("can't open \"%s\" to capture pymol stderr: %s", tmpname,
                   strerror(errno));
             exit(1);
@@ -2273 +2280 @@
             status = GetLine(&p->client, &numBytes, &line);
             if (status != BUFFER_OK) {
-                ERROR("can't read client stdout (numBytes=%d): %s", numBytes,
-                      strerror(errno));
+                ERROR("can't read client stdout (numBytes=%d, status=$d): %s",
+                      numBytes, status, strerror(errno));
                 goto done;
             }
@@ -2375 +2382 @@
             hdrLength = strlen(header);
 #if WRITE_DEBUG
-            DEBUG("Queueing image numBytes=%d cacheId=%s, frameNum=%d, rockOffset=%d size=%d", numBytes, cacheId, frameNum, rockOffset, numBytes + hdrLength);
+            DEBUG("Queueing image numBytes=%d cacheId=%s, frameNum=%d, rockOffset=%d size=%d",
+                  numBytes, cacheId, frameNum, rockOffset, numBytes + hdrLength);
 #endif
             imgPtr = NewImage(&list, numBytes + hdrLength);
@@ -2420 +2428 @@
     frecord = NULL;
     if (recording) {
-        char fileName[200];
+        char fileName[BUFSIZ];
 
         sprintf(fileName, "/tmp/pymolproxy%d.py", getpid());