[Opensrf-commits] r1434 - trunk/src/gateway

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-09-19 15:28:15 -0400 (Fri, 19 Sep 2008)
New Revision: 1434

Modified:
   trunk/src/gateway/osrf_http_translator.c
Log:
setting/clearing log XID.  honoring client log xid if present

Modified: trunk/src/gateway/osrf_http_translator.c
===================================================================
--- trunk/src/gateway/osrf_http_translator.c	2008-09-19 19:27:56 UTC (rev 1433)
+++ trunk/src/gateway/osrf_http_translator.c	2008-09-19 19:28:15 UTC (rev 1434)
@@ -116,11 +116,8 @@
     osrfStringArrayFree(params);
 
     /* load the request headers */
-    if (apr_table_get(apreq->headers_in, OSRF_HTTP_HEADER_XID) ) {
-        trans->localXid = 0;
-    } else {
-        trans->localXid = 1;
-    }
+    if (apr_table_get(apreq->headers_in, OSRF_HTTP_HEADER_XID)) // force our log xid to match the caller
+	    osrfLogForceXid(strdup(apr_table_get(apreq->headers_in, OSRF_HTTP_HEADER_XID)));
 
     trans->handle = osrfSystemGetTransportClient();
     trans->recipient = apr_table_get(apreq->headers_in, OSRF_HTTP_HEADER_TO);
@@ -454,6 +451,7 @@
     testConnection(r);
 
     osrfHttpTranslator* trans = osrfNewHttpTranslator(r);
+	osrfLogMkXid();
     if(trans->body) {
         stat = osrfHttpTranslatorProcess(trans);
         //osrfHttpTranslatorDebug(trans);