X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_log.cpp;h=ec34a738beccd6c41c0c693bbec0d3dcb4e354f2;hb=1bd4f51772d44c9dcdf21f44ffb92cbc2c962eef;hp=2cc54a42efc0e384c902a5bab642ea4fa8e3a277;hpb=cf09b1981338f07c333e43e0a2c907012c841c5d;p=metaproxy-moved-to-github.git diff --git a/src/filter_log.cpp b/src/filter_log.cpp index 2cc54a4..ec34a73 100644 --- a/src/filter_log.cpp +++ b/src/filter_log.cpp @@ -1,29 +1,88 @@ -/* $Id: filter_log.cpp,v 1.6 2005-10-25 11:48:30 adam Exp $ - Copyright (c) 2005, Index Data. +/* $Id: filter_log.cpp,v 1.20 2006-06-20 22:29:39 adam Exp $ + Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ - #include "config.hpp" -#include "filter.hpp" -#include "router.hpp" #include "package.hpp" +#include +#include +#include + +#include "util.hpp" +#include "xmlutil.hpp" #include "filter_log.hpp" +#include #include -#include -#include -#include +namespace mp = metaproxy_1; +namespace yf = metaproxy_1::filter; + +namespace metaproxy_1 { + namespace filter { + class Log::LFile { + public: + boost::mutex m_mutex; + std::string m_fname; + std::ofstream out; + LFile(std::string fname); + }; + typedef boost::shared_ptr LFilePtr; + class Log::Rep { + friend class Log; + Rep(); + void openfile(const std::string &fname); + std::string m_msg; + LFilePtr m_file; + bool m_req_apdu; + bool m_res_apdu; + bool m_req_session; + bool m_res_session; + bool m_init_options; + }; + // Only used during configure stage (no threading) + static std::list filter_log_files; + } +} + +yf::Log::Rep::Rep() +{ + m_req_apdu = true; + m_res_apdu = true; + m_req_session = true; + m_res_session = true; + m_init_options = false; +} + +yf::Log::Log(const std::string &x) : m_p(new Rep) +{ + m_p->m_msg = x; +} +yf::Log::Log() : m_p(new Rep) +{ +} -yp2::filter::Log::Log() {} +yf::Log::~Log() {} -void yp2::filter::Log::process(Package &package) const { +void stream_write(ODR o, void *handle, int type, const char *buf, int len) +{ + yf::Log::LFile *lfile = (yf::Log::LFile*) handle; + lfile->out.write(buf, len); +} + +void option_write(const char *name, void *handle) +{ + yf::Log::LFile *lfile = (yf::Log::LFile*) handle; + lfile->out << " " << name; +} +void yf::Log::process(mp::Package &package) const +{ Z_GDU *gdu; // getting timestamp for receiving of package @@ -32,19 +91,41 @@ void yp2::filter::Log::process(Package &package) const { // scope for locking Ostream { - boost::mutex::scoped_lock scoped_lock(m_log_mutex); - std::cout << receive_time << " " << m_msg; - std::cout << " request id=" << package.session().id(); - std::cout << " close=" - << (package.session().is_closed() ? "yes" : "no") - << "\n"; - gdu = package.request().get(); - if (gdu) + boost::mutex::scoped_lock scoped_lock(m_p->m_file->m_mutex); + + if (m_p->m_req_session) + { + m_p->m_file->out << receive_time << " " << m_p->m_msg; + m_p->m_file->out << " request id=" << package.session().id(); + m_p->m_file->out << " close=" + << (package.session().is_closed() ? "yes" : "no") + << "\n"; + } + if (m_p->m_init_options) + { + gdu = package.request().get(); + if (gdu && gdu->which == Z_GDU_Z3950 && + gdu->u.z3950->which == Z_APDU_initRequest) + { + m_p->m_file->out << receive_time << " " << m_p->m_msg; + m_p->m_file->out << " init options:"; + yaz_init_opt_decode(gdu->u.z3950->u.initRequest->options, + option_write, m_p->m_file.get()); + m_p->m_file->out << "\n"; + } + } + + if (m_p->m_req_apdu) { - ODR odr = odr_createmem(ODR_PRINT); - z_GDU(odr, &gdu, 0, 0); - odr_destroy(odr); + gdu = package.request().get(); + if (gdu) + { + mp::odr odr(ODR_PRINT); + odr_set_stream(odr, m_p->m_file.get(), stream_write, 0); + z_GDU(odr, &gdu, 0, 0); + } } + m_p->m_file->out.flush(); } // unlocked during move @@ -58,34 +139,139 @@ void yp2::filter::Log::process(Package &package) const { // scope for locking Ostream { - boost::mutex::scoped_lock scoped_lock(m_log_mutex); - std::cout << send_time << " " << m_msg; - std::cout << " response id=" << package.session().id(); - std::cout << " close=" - << (package.session().is_closed() ? "yes " : "no ") - << "duration=" << duration - << "\n"; - //<< "duration=" << duration.total_seconds() - // << "." << duration.fractional_seconds() - // << "\n"; + boost::mutex::scoped_lock scoped_lock(m_p->m_file->m_mutex); + if (m_p->m_res_session) + { + m_p->m_file->out << send_time << " " << m_p->m_msg; + m_p->m_file->out << " response id=" << package.session().id(); + m_p->m_file->out << " close=" + << (package.session().is_closed() ? "yes " : "no ") + << "duration=" << duration + << "\n"; + } + if (m_p->m_init_options) + { + gdu = package.response().get(); + if (gdu && gdu->which == Z_GDU_Z3950 && + gdu->u.z3950->which == Z_APDU_initResponse) + { + m_p->m_file->out << receive_time << " " << m_p->m_msg; + m_p->m_file->out << " init options:"; + yaz_init_opt_decode(gdu->u.z3950->u.initResponse->options, + option_write, m_p->m_file.get()); + m_p->m_file->out << "\n"; + } + } + if (m_p->m_res_apdu) + { + gdu = package.response().get(); + if (gdu) + { + mp::odr odr(ODR_PRINT); + odr_set_stream(odr, m_p->m_file.get(), stream_write, 0); + z_GDU(odr, &gdu, 0, 0); + } + } + m_p->m_file->out.flush(); + } +} + +yf::Log::LFile::LFile(std::string fname) : m_fname(fname) +{ + out.open(fname.c_str()); +} + +void yf::Log::Rep::openfile(const std::string &fname) +{ + std::list::const_iterator it = filter_log_files.begin(); + for (; it != filter_log_files.end(); it++) + { + if ((*it)->m_fname == fname) + { + m_file = *it; + return; + } } - - gdu = package.response().get(); - if (gdu) + LFilePtr newfile(new LFile(fname)); + filter_log_files.push_back(newfile); + m_file = newfile; +} + +void yf::Log::configure(const xmlNode *ptr) +{ + for (ptr = ptr->children; ptr; ptr = ptr->next) { - ODR odr = odr_createmem(ODR_PRINT); - z_GDU(odr, &gdu, 0, 0); - odr_destroy(odr); + if (ptr->type != XML_ELEMENT_NODE) + continue; + if (!strcmp((const char *) ptr->name, "message")) + m_p->m_msg = mp::xml::get_text(ptr); + else if (!strcmp((const char *) ptr->name, "filename")) + { + std::string fname = mp::xml::get_text(ptr); + m_p->openfile(fname); + } + else if (!strcmp((const char *) ptr->name, "category")) + { + const struct _xmlAttr *attr; + for (attr = ptr->properties; attr; attr = attr->next) + { + if (!strcmp((const char *) attr->name, "request-apdu")) + m_p->m_req_apdu = mp::xml::get_bool(attr->children, true); + else if (!strcmp((const char *) attr->name, "response-apdu")) + m_p->m_res_apdu = mp::xml::get_bool(attr->children, true); + else if (!strcmp((const char *) attr->name, "apdu")) + { + m_p->m_req_apdu = mp::xml::get_bool(attr->children, true); + m_p->m_res_apdu = m_p->m_req_apdu; + } + else if (!strcmp((const char *) attr->name, + "request-session")) + m_p->m_req_session = + mp::xml::get_bool(attr->children, true); + else if (!strcmp((const char *) attr->name, + "response-session")) + m_p->m_res_session = + mp::xml::get_bool(attr->children, true); + else if (!strcmp((const char *) attr->name, + "session")) + { + m_p->m_req_session = + mp::xml::get_bool(attr->children, true); + m_p->m_res_session = m_p->m_req_session; + } + else if (!strcmp((const char *) attr->name, + "init-options")) + m_p->m_init_options = + mp::xml::get_bool(attr->children, true); + else + throw mp::filter::FilterException( + "Bad attribute " + std::string((const char *) + attr->name)); + } + } + else + { + throw mp::filter::FilterException("Bad element " + + std::string((const char *) + ptr->name)); + } } + if (!m_p->m_file) + m_p->openfile("metaproxy.log"); } -void yp2::filter::Log::set_prefix(const std::string &msg) +static mp::filter::Base* filter_creator() { - m_msg = msg; + return new mp::filter::Log; } -// defining and initializing static members -boost::mutex yp2::filter::Log::m_log_mutex; +extern "C" { + struct metaproxy_1_filter_struct metaproxy_1_filter_log = { + 0, + "log", + filter_creator + }; +} /* * Local variables: