-/* $Id: filter_log.cpp,v 1.28 2007-01-25 14:05:54 adam Exp $
+/* $Id: filter_log.cpp,v 1.34 2008-02-26 23:56:28 adam Exp $
Copyright (c) 2005-2007, Index Data.
- See the LICENSE file for details
+This file is part of Metaproxy.
+
+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 Metaproxy; see the file LICENSE. If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
*/
#include "filter_log.hpp"
#include "util.hpp"
#include "xmlutil.hpp"
-#include <fstream>
#include <yaz/zgdu.h>
#include <yaz/wrbuf.h>
+#include <yaz/log.h>
#include <yaz/querytowrbuf.h>
+#include <stdio.h>
namespace mp = metaproxy_1;
namespace metaproxy_1 {
namespace filter {
-
class Log::Impl {
public:
class LFile;
typedef boost::shared_ptr<Log::Impl::LFile> 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);
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;
// for performance avoid opening files which other log filter
// instances already have opened
static std::list<LFilePtr> filter_log_files;
+
+ boost::mutex m_session_mutex;
+ std::map<mp::Session, std::string> 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);
};
}
{ // 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);
}
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),
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"))
}
}
-void yf::Log::Impl::process(mp::Package &package) const
+void yf::Log::Impl::process(mp::Package &package)
{
- Z_GDU *gdu;
+ Z_GDU *gdu = package.request().get();
+ std::string user("-");
// getting timestamp for receiving of package
boost::posix_time::ptime receive_time
= boost::posix_time::microsec_clock::local_time();
-
-
- // 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<mp::Session,std::string>::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
{
+ std::ostringstream os;
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) << " "
+ os << to_iso_extended_string(receive_time) << " "
<< m_msg_config << " "
<< package << " "
<< "000000.000000" << " "
}
}
+ if (m_user_access)
+ {
+ if (gdu)
+ {
+ os << to_iso_extended_string(receive_time) << " "
+ << m_msg_config << " " << user << " "
+ << package << " "
+ << "000000.000000" << " "
+ << *gdu
+ << "\n";
+ }
+ }
+
if (m_req_session)
{
- m_file->out << receive_time << " " << m_msg_config;
- m_file->out << " request id=" << package.session().id();
- m_file->out << " close="
+ os << receive_time << " " << m_msg_config;
+ os << " request id=" << package.session().id();
+ os << " close="
<< (package.session().is_closed() ? "yes" : "no")
<< "\n";
}
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:";
+ os << receive_time << " " << m_msg_config;
+ os << " init options:";
yaz_init_opt_decode(gdu->u.z3950->u.initRequest->options,
- option_write, m_file.get());
- m_file->out << "\n";
+ option_write, m_file->fhandle);
+ os << "\n";
}
}
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();
+ fputs(os.str().c_str(), m_file->fhandle);
+ fflush(m_file->fhandle);
}
// unlocked during move
package.move();
+ gdu = package.response().get();
+
// getting timestamp for sending of package
boost::posix_time::ptime send_time
= boost::posix_time::microsec_clock::local_time();
// scope for locking Ostream
{
boost::mutex::scoped_lock scoped_lock(m_file->m_mutex);
+ std::ostringstream os;
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) << " "
+ os << to_iso_extended_string(send_time) << " "
<< m_msg_config << " "
<< package << " "
<< to_iso_string(duration) << " "
<< "\n";
}
}
+ if (m_user_access)
+ {
+ if (gdu)
+ {
+ os << to_iso_extended_string(send_time) << " "
+ << m_msg_config << " " << user << " "
+ << package << " "
+ << to_iso_string(duration) << " "
+ << *gdu
+ << "\n";
+ }
+ }
if (m_res_session)
{
- m_file->out << send_time << " " << m_msg_config;
- m_file->out << " response id=" << package.session().id();
- m_file->out << " close="
+ os << send_time << " " << m_msg_config;
+ os << " response id=" << package.session().id();
+ os << " close="
<< (package.session().is_closed() ? "yes " : "no ")
<< "duration=" << duration
<< "\n";
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:";
+ os << receive_time << " " << 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, m_file->fhandle);
+ os << "\n";
}
}
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();
+ fputs(os.str().c_str(), m_file->fhandle);
+ fflush(m_file->fhandle);
}
}
}
// open stdout for empty file
LFilePtr newfile(fname.length() == 0
- ? new LFile(fname, std::cout)
+ ? new LFile(fname, yaz_log_file())
: new LFile(fname));
filter_log_files.push_back(newfile);
m_file = newfile;
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 *fhandle = (FILE*) handle;
+ fwrite(buf, len, 1, fhandle);
}
void yf::Log::Impl::option_write(const char *name, void *handle)
{
- yf::Log::Impl::LFile *lfile = (yf::Log::Impl::LFile*) handle;
- lfile->out << " " << name;
+ FILE *fhandle = (FILE*) handle;
+ fprintf(fhandle, " %s", name);
}
yf::Log::Impl::LFile::LFile(std::string fname) :
- m_fname(fname), fout(fname.c_str()), out(fout)
+ m_fname(fname)
+
{
+ fhandle = fopen(fname.c_str(), "a");
}
-yf::Log::Impl::LFile::LFile(std::string fname, std::ostream &use_this) :
- m_fname(fname), out(use_this)
+yf::Log::Impl::LFile::LFile(std::string fname, FILE *outf) :
+ m_fname(fname)
{
+ fhandle = outf;
}
-
+yf::Log::Impl::LFile::~LFile()
+{
+}
static mp::filter::Base* filter_creator()
projects / metaproxy-moved-to-github.git / blobdiff