X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_log.cpp;h=1c8d9fc6491b03ea630bcfe1e343a926128346c2;hb=d0123337d70b0fb97b578cc57467bb94980f1014;hp=84b43082df70835aec4150906f528cf2f9247dc3;hpb=b70b9ec78f0ab1c3ed3b432de986159129a0e4ed;p=metaproxy-moved-to-github.git diff --git a/src/filter_log.cpp b/src/filter_log.cpp index 84b4308..1c8d9fc 100644 --- a/src/filter_log.cpp +++ b/src/filter_log.cpp @@ -1,8 +1,20 @@ -/* $Id: filter_log.cpp,v 1.28 2007-01-25 14:05:54 adam Exp $ - Copyright (c) 2005-2007, Index Data. +/* This file is part of Metaproxy. + Copyright (C) 2005-2009 Index Data - See the LICENSE file for details - */ +Metaproxy is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #include "filter_log.hpp" #include "config.hpp" @@ -10,34 +22,35 @@ #include #include +#include #include -#include #include "gduutil.hpp" #include "util.hpp" #include "xmlutil.hpp" -#include #include #include +#include #include - +#include +#include +#include namespace mp = metaproxy_1; namespace yf = metaproxy_1::filter; namespace metaproxy_1 { namespace filter { - class Log::Impl { public: class LFile; typedef boost::shared_ptr LFilePtr; public: //Impl(); - Impl(const std::string &x = ""); + Impl(const std::string &x = "-"); ~Impl(); - void process(metaproxy_1::Package & package) const; + void process(metaproxy_1::Package & package); void configure(const xmlNode * ptr); private: void openfile(const std::string &fname); @@ -49,26 +62,34 @@ namespace metaproxy_1 { private: std::string m_msg_config; bool m_access; + bool m_user_access; bool m_req_apdu; bool m_res_apdu; bool m_req_session; bool m_res_session; bool m_init_options; LFilePtr m_file; - // Only used during configure stage (no threading), + std::string m_time_format; + // Only used during confiqgure stage (no threading), // for performance avoid opening files which other log filter // instances already have opened static std::list filter_log_files; + + boost::mutex m_session_mutex; + std::map m_sessions; }; class Log::Impl::LFile { public: boost::mutex m_mutex; std::string m_fname; - std::ofstream fout; - std::ostream &out; + FILE *fhandle; + ~LFile(); LFile(std::string fname); - LFile(std::string fname, std::ostream &use_this); + LFile(std::string fname, FILE *outf); + void log(const std::string &date_format, + std::ostringstream &os); + void flush(); }; } @@ -88,7 +109,7 @@ yf::Log::~Log() { // must have a destructor because of boost::scoped_ptr } -void yf::Log::configure(const xmlNode *xmlnode) +void yf::Log::configure(const xmlNode *xmlnode, bool test_only) { m_p->configure(xmlnode); } @@ -99,31 +120,20 @@ void yf::Log::process(mp::Package &package) const } -// define Implementation stuff - // static initialization std::list yf::Log::Impl::filter_log_files; -// yf::Log::Impl::Impl() -// { -// m_access = true; -// m_req_apdu = false; -// m_res_apdu = false; -// m_req_session = false; -// m_res_session = false; -// m_init_options = false; -// openfile(""); -// } - yf::Log::Impl::Impl(const std::string &x) : m_msg_config(x), m_access(true), + m_user_access(false), m_req_apdu(false), m_res_apdu(false), m_req_session(false), m_res_session(false), - m_init_options(false) + m_init_options(false), + m_time_format("%H:%M:%S-%d/%m") { openfile(""); } @@ -147,15 +157,19 @@ void yf::Log::Impl::configure(const xmlNode *ptr) std::string fname = mp::xml::get_text(ptr); openfile(fname); } + else if (!strcmp((const char *) ptr->name, "time-format")) + { + m_time_format = mp::xml::get_text(ptr); + } 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, - "access")) - m_access = - mp::xml::get_bool(attr->children, true); + if (!strcmp((const char *) attr->name, "access")) + m_access = mp::xml::get_bool(attr->children, true); + else if (!strcmp((const char *) attr->name, "user-access")) + m_user_access = mp::xml::get_bool(attr->children, true); else if (!strcmp((const char *) attr->name, "request-apdu")) m_req_apdu = mp::xml::get_bool(attr->children, true); else if (!strcmp((const char *) attr->name, "response-apdu")) @@ -184,6 +198,10 @@ void yf::Log::Impl::configure(const xmlNode *ptr) "init-options")) m_init_options = mp::xml::get_bool(attr->children, true); + else if (!strcmp((const char *) attr->name, + "init-options")) + m_init_options = + mp::xml::get_bool(attr->children, true); else throw mp::filter::FilterException( "Bad attribute " + std::string((const char *) @@ -199,82 +217,114 @@ void yf::Log::Impl::configure(const xmlNode *ptr) } } -void yf::Log::Impl::process(mp::Package &package) const +void yf::Log::Impl::process(mp::Package &package) { - Z_GDU *gdu; - - // getting timestamp for receiving of package - boost::posix_time::ptime receive_time - = boost::posix_time::microsec_clock::local_time(); + Z_GDU *gdu = package.request().get(); + std::string user("-"); + yaz_timing_t timer = yaz_timing_create(); - - // scope for locking Ostream + // scope for session lock + { + boost::mutex::scoped_lock scoped_lock(m_session_mutex); + + if (gdu && gdu->which == Z_GDU_Z3950) + { + Z_APDU *apdu_req = gdu->u.z3950; + if (apdu_req->which == Z_APDU_initRequest) + { + Z_InitRequest *req = apdu_req->u.initRequest; + Z_IdAuthentication *a = req->idAuthentication; + if (a) + { + if (a->which == Z_IdAuthentication_idPass) + user = a->u.idPass->userId; + else if (a->which == Z_IdAuthentication_open) + user = a->u.open; + + m_sessions[package.session()] = user; + } + } + } + std::map::iterator it = + m_sessions.find(package.session()); + if (it != m_sessions.end()) + user = it->second; + + if (package.session().is_closed()) + m_sessions.erase(package.session()); + } + // scope for locking Ostream { boost::mutex::scoped_lock scoped_lock(m_file->m_mutex); - if (m_access) { - gdu = package.request().get(); if (gdu) { - m_file->out - //<< receive_time << " " - //<< to_iso_string(receive_time) << " " - << to_iso_extended_string(receive_time) << " " - << m_msg_config << " " + std::ostringstream os; + os << m_msg_config << " " << package << " " - << "000000.000000" << " " - << *gdu - << "\n"; + << "0.000000" << " " + << *gdu; + m_file->log(m_time_format, os); + } + } + + if (m_user_access) + { + if (gdu) + { + std::ostringstream os; + os << m_msg_config << " " << user << " " + << package << " " + << "0.000000" << " " + << *gdu; + m_file->log(m_time_format, os); } } if (m_req_session) { - m_file->out << receive_time << " " << m_msg_config; - m_file->out << " request id=" << package.session().id(); - m_file->out << " close=" - << (package.session().is_closed() ? "yes" : "no") - << "\n"; + std::ostringstream os; + os << m_msg_config; + os << " request id=" << package.session().id(); + os << " close=" + << (package.session().is_closed() ? "yes" : "no"); + m_file->log(m_time_format, os); } if (m_init_options) { - gdu = package.request().get(); if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which == Z_APDU_initRequest) { - m_file->out << receive_time << " " << m_msg_config; - m_file->out << " init options:"; + std::ostringstream os; + os << m_msg_config << " init options:"; yaz_init_opt_decode(gdu->u.z3950->u.initRequest->options, - option_write, m_file.get()); - m_file->out << "\n"; + option_write, &os); + m_file->log(m_time_format, os); } } if (m_req_apdu) { - gdu = package.request().get(); if (gdu) { mp::odr odr(ODR_PRINT); - odr_set_stream(odr, m_file.get(), stream_write, 0); + odr_set_stream(odr, m_file->fhandle, stream_write, 0); z_GDU(odr, &gdu, 0, 0); } } - m_file->out.flush(); } // unlocked during move package.move(); - // getting timestamp for sending of package - boost::posix_time::ptime send_time - = boost::posix_time::microsec_clock::local_time(); + gdu = package.response().get(); - boost::posix_time::time_duration duration = send_time - receive_time; + yaz_timing_stop(timer); + double duration = yaz_timing_get_real(timer); // scope for locking Ostream { @@ -282,58 +332,68 @@ void yf::Log::Impl::process(mp::Package &package) const if (m_access) { - gdu = package.response().get(); if (gdu) { - m_file->out - //<< send_time << " " - //<< to_iso_string(send_time) << " " - << to_iso_extended_string(send_time) << " " - << m_msg_config << " " + std::ostringstream os; + os << m_msg_config << " " + << package << " " + << std::fixed << std::setprecision (6) << duration + << " " + << *gdu; + m_file->log(m_time_format, os); + } + } + if (m_user_access) + { + if (gdu) + { + std::ostringstream os; + os << m_msg_config << " " << user << " " << package << " " - << to_iso_string(duration) << " " - << *gdu - << "\n"; + << std::fixed << std::setprecision (6) << duration << " " + << *gdu; + m_file->log(m_time_format, os); } } if (m_res_session) { - m_file->out << send_time << " " << m_msg_config; - m_file->out << " response id=" << package.session().id(); - m_file->out << " close=" - << (package.session().is_closed() ? "yes " : "no ") - << "duration=" << duration - << "\n"; + std::ostringstream os; + os << m_msg_config; + os << " response id=" << package.session().id(); + os << " close=" + << (package.session().is_closed() ? "yes " : "no ") + << "duration=" + << std::fixed << std::setprecision (6) << duration; + m_file->log(m_time_format, os); } if (m_init_options) { - gdu = package.response().get(); if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which == Z_APDU_initResponse) { - m_file->out << receive_time << " " << m_msg_config; - m_file->out << " init options:"; + std::ostringstream os; + os << m_msg_config; + os << " init options:"; yaz_init_opt_decode(gdu->u.z3950->u.initResponse->options, - option_write, m_file.get()); - m_file->out << "\n"; + option_write, &os); + m_file->log(m_time_format, os); } } if (m_res_apdu) { - gdu = package.response().get(); if (gdu) { mp::odr odr(ODR_PRINT); - odr_set_stream(odr, m_file.get(), stream_write, 0); + odr_set_stream(odr, m_file->fhandle, stream_write, 0); z_GDU(odr, &gdu, 0, 0); } } - - m_file->out.flush(); } + m_file->flush(); + yaz_timing_destroy(&timer); } @@ -349,10 +409,7 @@ void yf::Log::Impl::openfile(const std::string &fname) return; } } - // open stdout for empty file - LFilePtr newfile(fname.length() == 0 - ? new LFile(fname, std::cout) - : new LFile(fname)); + LFilePtr newfile(new LFile(fname)); filter_log_files.push_back(newfile); m_file = newfile; } @@ -360,29 +417,61 @@ void yf::Log::Impl::openfile(const std::string &fname) void yf::Log::Impl::stream_write(ODR o, void *handle, int type, const char *buf, int len) { - yf::Log::Impl::LFile *lfile = (yf::Log::Impl::LFile*) handle; - lfile->out.write(buf, len); + FILE *f = (FILE*) handle; + fwrite(buf, len, 1, f ? f : yaz_log_file()); } void yf::Log::Impl::option_write(const char *name, void *handle) { - yf::Log::Impl::LFile *lfile = (yf::Log::Impl::LFile*) handle; - lfile->out << " " << name; + std::ostringstream *os = (std::ostringstream *) handle; + *os << " " << name; } yf::Log::Impl::LFile::LFile(std::string fname) : - m_fname(fname), fout(fname.c_str()), out(fout) + m_fname(fname) + { + if (fname.c_str()) + fhandle = fopen(fname.c_str(), "a"); + else + fhandle = 0; } -yf::Log::Impl::LFile::LFile(std::string fname, std::ostream &use_this) : - m_fname(fname), out(use_this) +yf::Log::Impl::LFile::~LFile() { } +void yf::Log::Impl::LFile::log(const std::string &date_format, + std::ostringstream &os) +{ + if (fhandle) + { + char datestr[80]; + time_t ti = time(0); +#if HAVE_LOCALTIME_R + struct tm tm0, *tm = &tm0; + localtime_r(&ti, tm); +#else + struct tm *tm = localtime(&ti); +#endif + if (strftime(datestr, sizeof(datestr)-1, date_format.c_str(), tm)) + { + fputs(datestr, fhandle); + fputs(" ", fhandle); + } + fputs(os.str().c_str(), fhandle); + fputc('\n', fhandle); + } + else + yaz_log(YLOG_LOG, "%s", os.str().c_str()); +} - +void yf::Log::Impl::LFile::flush() +{ + if (fhandle) + fflush(fhandle); +} static mp::filter::Base* filter_creator() { @@ -400,8 +489,9 @@ extern "C" { /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil - * c-file-style: "stroustrup" * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +