Changeset 6617

Timestamp:

Nov 11, 2016 3:50:35 AM (7 years ago)

Author:

ldelgass

Message:

More logging fixes

Location:

pymolproxy/trunk

Files:

• Makefile.in (modified) (3 diffs)
• pymolproxy.c (modified) (9 diffs)

pymolproxy/trunk/Makefile.in

@@ +1 @@
+WANT_DEBUG      = #yes
 
 TARGETS =       pymolproxy
@@ -8 +9 @@
                 -DSVN_VERSION=\"$(SVN_VERSION)\" \
                 -DSTATSDIR=\"$(STATSDIR)\" \
-                -DLOGDIR=\"$(LOGDIR)\" 
+                -DLOGDIR=\"$(LOGDIR)\"
 EXTRA_CFLAGS =  -Wall 
 INCLUDES =      $(TCL_INC_SPEC) -I$(srcdir)
@@ -31 +32 @@
 STATSDIR        = @STATSDIR@
 LOGDIR          = @LOGDIR@
+
+ifdef WANT_DEBUG
+DEFINES += -DWANT_DEBUG
+endif
 
 .PHONY: all install clean distclean

pymolproxy/trunk/pymolproxy.c

@@ -99 +99 @@
 #define TRUE  1
 
-static int debug = FALSE;
-static FILE *frecord;
+static FILE *frecord = NULL;
+static FILE *flog = NULL;
 static int recording = FALSE;
 static int pymolIsAlive = TRUE;
 static int statsFile = -1;
 
-#define WANT_DEBUG  0
-#define READ_DEBUG  0
-#define WRITE_DEBUG 0
-#define EXEC_DEBUG  0
+#define READ_DEBUG  1
+#define WRITE_DEBUG 1
+#define EXEC_DEBUG  1
 #define LOG_PYMOL_STDERR 0
 
@@ -213 +212 @@
 } PymolProxy;
 
-#if WANT_DEBUG
-#define DEBUG(...) if (debug) PrintToLog(__VA_ARGS__)
+#ifdef WANT_DEBUG
+#define DEBUG(...) PrintToLog(__VA_ARGS__)
 #else
 #define DEBUG(...)
@@ -224 +223 @@
 #define INFO(...)  SysLog(LOG_INFO, __FILE__, __LINE__, __VA_ARGS__)
 
+#if 0
 static const char *syslogLevels[] = {
     "emergency", /* System is unusable */
@@ -234 +234 @@
     "debug",     /* Debug-level messages */
 };
-
-#if WANT_DEBUG
+#endif
+
+#ifdef WANT_DEBUG
 static void
 PrintToLog(const char *format, ...)
@@ -241 +242 @@
     va_list args;
 
+    if (flog == NULL) return;
+
     va_start(args, format);
-    fprintf(stderr, "pymolproxy: ");
-    vfprintf(stderr, format, args);
+    fprintf(flog, "pymolproxy: ");
+    vfprintf(flog, format, args);
     va_end(args);
-    fprintf(stderr, "\n");
-    fflush(stderr);
+    fprintf(flog, "\n");
+    fflush(flog);
 }
 #endif
@@ -266 +269 @@
         s++;
     }
-    length = snprintf(message, MSG_LEN, "pymolproxy (%d) %s: %s:%d ",
-        getpid(), syslogLevels[priority],  s, lineNum);
+    length = snprintf(message, MSG_LEN, "%s:%d: ", s, lineNum);
     length += vsnprintf(message + length, MSG_LEN - length, fmt, lst);
     message[MSG_LEN] = '\0';
     va_end(lst);
 
-    if (debug) {
+    if (priority == LOG_DEBUG) {
         DEBUG("%s", message);
     } else {
@@ -283 +285 @@
 {
     va_list args;
+
+    if (frecord == NULL) return;
 
     va_start(args, format);
@@ -2280 +2284 @@
             status = GetLine(&p->client, &numBytes, &line);
             if (status != BUFFER_OK) {
-                ERROR("can't read client stdout (numBytes=%d, status=%d): %s",
-                      numBytes, status, strerror(errno));
+                if (status == BUFFER_EOF) {
+                    DEBUG("Exiting server on EOF from client");
+                } else {
+                    ERROR("Exiting server, failed to read from client (numBytes=%d, status=%d): %s",
+                          numBytes, status, strerror(errno));
+                }
                 goto done;
             }
@@ -2439 +2447 @@
         ERROR("Short write on version string", strerror(errno));
     }
+
+    flog = stderr;
+    openlog("pymolproxy", LOG_CONS | LOG_PERROR | LOG_PID, LOG_USER);
     DEBUG("Starting pymolproxy");