Changeset 3394 for trunk/packages/vizservers/pymolproxy/pymolproxy2.c

Timestamp:

Feb 28, 2013 11:37:18 AM (11 years ago)

Author:

gah

Message:

fix up stats reporting in servers

File:

• trunk/packages/vizservers/pymolproxy/pymolproxy2.c (modified) (3 diffs)

trunk/packages/vizservers/pymolproxy/pymolproxy2.c

@@ -561 +561 @@
     md5_byte_t digest[16];
 
-    if (string == NULL) {
+    if ((string == NULL) || (statsFile >= 0)) {
         return statsFile;
     }
@@ -936 +936 @@
     Tcl_DStringInit(&ds);
     if (first) {
-        Tcl_DStringAppendElement(&ds, "render_start");
-        first = 0;
+        first = 0;
+        Tcl_DStringAppendElement(&ds, "render_start");
+        /* server */
+        Tcl_DStringAppendElement(&ds, "server");
+        Tcl_DStringAppendElement(&ds, "pymol");
+        /* pid */
+        Tcl_DStringAppendElement(&ds, "pid");
+        sprintf(buf, "%d", getpid());
+        Tcl_DStringAppendElement(&ds, buf);
+        /* machine */
+        Tcl_DStringAppendElement(&ds, "machine");
+        gethostname(buf, BUFSIZ-1);
+        buf[BUFSIZ-1] = '\0';
+        Tcl_DStringAppendElement(&ds, buf);
     } else {
-        Tcl_DStringAppendElement(&ds, "render_info");
-    }
-    /* renderer */
-    Tcl_DStringAppendElement(&ds, "renderer");
-    Tcl_DStringAppendElement(&ds, "nanovis");
-    /* pid */
-    Tcl_DStringAppendElement(&ds, "pid");
-    sprintf(buf, "%d", getpid());
-    Tcl_DStringAppendElement(&ds, buf);
-    /* host */
-    Tcl_DStringAppendElement(&ds, "host");
-    gethostname(buf, BUFSIZ-1);
-    buf[BUFSIZ-1] = '\0';
-    Tcl_DStringAppendElement(&ds, buf);
+        Tcl_DStringAppendElement(&ds, "render_info");
+    }
     /* date */
     Tcl_DStringAppendElement(&ds, "date");
@@ -964 +964 @@
 
     /* Client arguments. */
-    if (Tcl_SplitList(interp, argv[2], &numElems, &elems) != TCL_OK) {
+    if (Tcl_SplitList(interp, argv[1], &numElems, &elems) != TCL_OK) {
         return TCL_ERROR;
     }