X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_log.cpp;h=a1baf483f6a479271ba0b2f871b1156fb16264e7;hb=9f255f52501e9429f643772a186cc7a72a5e8893;hp=917cc1b82edeb079a7080e74b73a2d65743b2dc4;hpb=2d8529c578017f110ff38e10704f586c204faca8;p=metaproxy-moved-to-github.git diff --git a/src/filter_log.cpp b/src/filter_log.cpp index 917cc1b..a1baf48 100644 --- a/src/filter_log.cpp +++ b/src/filter_log.cpp @@ -1,9 +1,10 @@ -/* $Id: filter_log.cpp,v 1.22 2006-08-28 21:40:24 marc Exp $ +/* $Id: filter_log.cpp,v 1.26 2006-08-31 12:56:40 marc Exp $ Copyright (c) 2005-2006, Index Data. See the LICENSE file for details */ +#include "filter_log.hpp" #include "config.hpp" #include "package.hpp" @@ -12,9 +13,9 @@ #include #include +#include "gduutil.hpp" #include "util.hpp" #include "xmlutil.hpp" -#include "filter_log.hpp" #include #include @@ -57,10 +58,11 @@ namespace metaproxy_1 { yf::Log::Rep::Rep() { - m_req_apdu = true; - m_res_apdu = true; - m_req_session = true; - m_res_session = true; + m_access = true; + m_req_apdu = false; + m_res_apdu = false; + m_req_session = false; + m_res_session = false; m_init_options = false; openfile(""); } @@ -97,10 +99,6 @@ void yf::Log::process(mp::Package &package) const = boost::posix_time::microsec_clock::local_time(); - std::ostringstream msg_request; - std::ostringstream msg_request_2; - std::ostringstream msg_response; - std::ostringstream msg_response_2; // scope for locking Ostream { @@ -109,149 +107,19 @@ void yf::Log::process(mp::Package &package) const if (m_p->m_access) { - gdu = package.request().get(); - WRBUF wr = wrbuf_alloc(); - - if (gdu && gdu->which == Z_GDU_Z3950) - { - - msg_request << "Z39.50" << " "; - - switch(gdu->u.z3950->which) - { - case Z_APDU_initRequest: - msg_request - << "initRequest" << " " - << "OK" << " "; - - { - Z_InitRequest *ir - = gdu->u.z3950->u.initRequest; - msg_request_2 - << (ir->implementationId) << " " - //<< ir->referenceId << " " - << (ir->implementationName) << " " - << (ir->implementationVersion) << " "; - } - break; - case Z_APDU_searchRequest: - msg_request - << "searchRequest" << " " - << "OK" << " "; - { - Z_SearchRequest *sr - = gdu->u.z3950->u.searchRequest; - - for (int i = 0; i < sr->num_databaseNames; i++) - { - msg_request << sr->databaseNames[i]; - if (i+1 == sr->num_databaseNames) - msg_request << " "; - else - msg_request << "+"; - } - - yaz_query_to_wrbuf(wr, sr->query); - } - msg_request_2 << wrbuf_buf(wr) << " "; - break; - case Z_APDU_presentRequest: - msg_request - << "presentRequest" << " " - << "OK" << " "; - { - Z_PresentRequest *pr - = gdu->u.z3950->u.presentRequest; - msg_request_2 - << pr->resultSetId << " " - //<< pr->referenceId << " " - << *(pr->resultSetStartPoint) << " " - << *(pr->numberOfRecordsRequested) << " "; - } - break; - case Z_APDU_deleteResultSetRequest: - msg_request - << "deleteResultSetRequest" << " " - << "OK" << " "; - break; - case Z_APDU_accessControlRequest: - msg_request - << "accessControlRequest" << " " - << "OK" << " "; - break; - case Z_APDU_resourceControlRequest: - msg_request - << "resourceControlRequest" << " " - << "OK" << " "; - break; - case Z_APDU_triggerResourceControlRequest: - msg_request - << "triggerResourceControlRequest" << " " - << "OK" << " "; - break; - case Z_APDU_resourceReportRequest: - msg_request - << "resourceReportRequest" << " " - << "OK" << " "; - break; - case Z_APDU_scanRequest: - msg_request - << "scanRequest" << " " - << "OK" << " "; - break; - case Z_APDU_sortRequest: - msg_request - << "sortRequest" << " " - << "OK" << " "; - break; - case Z_APDU_segmentRequest: - msg_request - << "segmentRequest" << " " - << "OK" << " "; - break; - case Z_APDU_extendedServicesRequest: - msg_request - << "extendedServicesRequest" << " " - << "OK" << " "; - break; - case Z_APDU_close: - msg_response - << "close" << " " - << "OK" << " "; - break; - case Z_APDU_duplicateDetectionRequest: - msg_request - << "duplicateDetectionRequest" << " " - << "OK" << " "; - break; - default: - msg_request - << "unknown" << " " - << "ERROR" << " "; - } - } - else if (gdu && gdu->which == Z_GDU_HTTP_Request) - msg_request << "HTTP " << "unknown " ; - else if (gdu && gdu->which == Z_GDU_HTTP_Response) - msg_request << "HTTP-Response " << "unknown " ; - else - msg_request << "unknown " << "unknown " ; - - wrbuf_free(wr, 1); - - m_p->m_file->out - << m_p->m_msg_config << " " - << package.session().id() << " " - << receive_time << " " - // << send_time << " " - << "00:00:00.000000" << " " - // << duration << " " - << msg_request.str() - << msg_request_2.str() - //<< msg_response.str() - //<< msg_response_2.str() - << "\n"; + if (gdu) + { + m_p->m_file->out + //<< receive_time << " " + //<< to_iso_string(receive_time) << " " + << to_iso_extended_string(receive_time) << " " + << m_p->m_msg_config << " " + << package << " " + << "000000.000000" << " " + << *gdu + << "\n"; + } } if (m_p->m_req_session) @@ -262,6 +130,7 @@ void yf::Log::process(mp::Package &package) const << (package.session().is_closed() ? "yes" : "no") << "\n"; } + if (m_p->m_init_options) { gdu = package.request().get(); @@ -275,7 +144,7 @@ void yf::Log::process(mp::Package &package) const m_p->m_file->out << "\n"; } } - + if (m_p->m_req_apdu) { gdu = package.request().get(); @@ -288,7 +157,7 @@ void yf::Log::process(mp::Package &package) const } m_p->m_file->out.flush(); } - + // unlocked during move package.move(); @@ -301,139 +170,24 @@ void yf::Log::process(mp::Package &package) const // scope for locking Ostream { boost::mutex::scoped_lock scoped_lock(m_p->m_file->m_mutex); + if (m_p->m_access) { gdu = package.response().get(); - //WRBUF wr = wrbuf_alloc(); - - - if (gdu && gdu->which == Z_GDU_Z3950) - { - - msg_response << "Z39.50" << " "; - - switch(gdu->u.z3950->which) - { - case Z_APDU_initResponse: - msg_response << "initResponse" << " "; - { - Z_InitResponse *ir - = gdu->u.z3950->u.initResponse; - if (*(ir->result)) - msg_response_2 - << "OK" << " " - << (ir->implementationId) << " " - //<< ir->referenceId << " " - << (ir->implementationName) << " " - << (ir->implementationVersion) << " "; - else - msg_response_2 - << "ERROR" << " " - << "- - -" << " "; - - } - break; - case Z_APDU_searchResponse: - msg_response << "searchResponse" << " "; - { - Z_SearchResponse *sr - = gdu->u.z3950->u.searchResponse; - if (*(sr->searchStatus)) - msg_response_2 - << "OK" << " " - << *(sr->resultCount) << " " - //<< sr->referenceId << " " - << *(sr->numberOfRecordsReturned) << " " - << *(sr->nextResultSetPosition) << " "; - else - msg_response_2 - << "ERROR" << " " - << "- - -" << " "; - - } - //msg_response << wrbuf_buf(wr) << " "; - break; - case Z_APDU_presentResponse: - msg_response << "presentResponse" << " "; - { - Z_PresentResponse *pr - = gdu->u.z3950->u.presentResponse; - if (!*(pr->presentStatus)) - msg_response_2 - << "OK" << " " - << "-" << " " - //<< pr->referenceId << " " - << *(pr->numberOfRecordsReturned) << " " - << *(pr->nextResultSetPosition) << " "; - else - msg_response_2 - << "ERROR" << " " - << "-" << " " - //<< pr->referenceId << " " - << *(pr->numberOfRecordsReturned) << " " - << *(pr->nextResultSetPosition) << " "; - //<< "- - -" << " "; - } - break; - case Z_APDU_deleteResultSetResponse: - msg_response << "deleteResultSetResponse" << " "; - break; - case Z_APDU_accessControlResponse: - msg_response << "accessControlResponse" << " "; - break; - case Z_APDU_resourceControlResponse: - msg_response << "resourceControlResponse" << " "; - break; - //case Z_APDU_triggerResourceControlResponse: - //msg_response << "triggerResourceControlResponse" << " "; - //break; - case Z_APDU_resourceReportResponse: - msg_response << "resourceReportResponse" << " "; - break; - case Z_APDU_scanResponse: - msg_response << "scanResponse" << " "; - break; - case Z_APDU_sortResponse: - msg_response << "sortResponse" << " "; - break; - // case Z_APDU_segmentResponse: - // msg_response << "segmentResponse" << " "; - // break; - case Z_APDU_extendedServicesResponse: - msg_response << "extendedServicesResponse" << " "; - break; - case Z_APDU_close: - msg_response << "close" << " "; - break; - case Z_APDU_duplicateDetectionResponse: - msg_response << "duplicateDetectionResponse" << " "; - break; - default: - msg_response << "unknown" << " "; - } - } - else if (gdu && gdu->which == Z_GDU_HTTP_Request) - msg_response << "HTTP " << "unknown " ; - else if (gdu && gdu->which == Z_GDU_HTTP_Response) - msg_response << "HTTP-Response " << "unknown " ; - else - msg_response << "unknown " << "unknown " ; - - m_p->m_file->out - << m_p->m_msg_config << " " - << package.session().id() << " " - // << receive_time << " " - << send_time << " " - //<< "-" << " " - << duration << " " - //<< msg_request.str() - //<< msg_request_2.str() - << msg_response.str() - << msg_response_2.str() - << "\n"; - - //wrbuf_free(wr, 1); + if (gdu) + { + m_p->m_file->out + //<< send_time << " " + //<< to_iso_string(send_time) << " " + << to_iso_extended_string(send_time) << " " + << m_p->m_msg_config << " " + << package << " " + << to_iso_string(duration) << " " + << *gdu + << "\n"; + } } + if (m_p->m_res_session) { m_p->m_file->out << send_time << " " << m_p->m_msg_config; @@ -443,6 +197,7 @@ void yf::Log::process(mp::Package &package) const << "duration=" << duration << "\n"; } + if (m_p->m_init_options) { gdu = package.response().get(); @@ -456,6 +211,7 @@ void yf::Log::process(mp::Package &package) const m_p->m_file->out << "\n"; } } + if (m_p->m_res_apdu) { gdu = package.response().get(); @@ -466,6 +222,7 @@ void yf::Log::process(mp::Package &package) const z_GDU(odr, &gdu, 0, 0); } } + m_p->m_file->out.flush(); } }