+ Z_GDU *gdu_req = package.request().get();
+ std::string user("-");
+
+ yaz_timing_t timer = yaz_timing_create();
+
+ // scope for session lock
+ {
+ boost::mutex::scoped_lock scoped_lock(m_session_mutex);
+
+ if (gdu_req && gdu_req->which == Z_GDU_Z3950)
+ {
+ Z_APDU *apdu_req = gdu_req->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
+ {
+ boost::mutex::scoped_lock scoped_lock(m_file->m_mutex);
+
+ if (m_access)
+ {
+ if (gdu_req)
+ {
+ std::ostringstream os;
+ os << m_msg_config << " "
+ << package << " "
+ << "0.000000" << " "
+ << *gdu_req;
+ m_file->log(m_time_format, os);
+ }
+ }
+
+ if (m_user_access)
+ {
+ if (gdu_req)
+ {
+ std::ostringstream os;
+ os << m_msg_config << " " << user << " "
+ << package << " "
+ << "0.000000" << " "
+ << *gdu_req;
+ m_file->log(m_time_format, os);
+ }
+ }
+
+ if (m_req_session)
+ {
+ 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)
+ {
+ if (gdu_req && gdu_req->which == Z_GDU_Z3950 &&
+ gdu_req->u.z3950->which == Z_APDU_initRequest)
+ {
+ std::ostringstream os;
+ os << m_msg_config << " init options:";
+ yaz_init_opt_decode(gdu_req->u.z3950->u.initRequest->options,
+ option_write, &os);
+ m_file->log(m_time_format, os);
+ }
+ }
+
+ if (m_req_apdu)
+ {
+ if (gdu_req)
+ {
+ mp::odr odr(ODR_PRINT);
+ odr_set_stream(odr, m_file->fhandle, stream_write, 0);
+ z_GDU(odr, &gdu_req, 0, 0);
+ }
+ }
+ }
+
+ // unlocked during move
+ package.move();
+
+ Z_GDU *gdu_res = package.response().get();
+
+ yaz_timing_stop(timer);
+ double duration = yaz_timing_get_real(timer);
+
+ // scope for locking Ostream
+ {
+ boost::mutex::scoped_lock scoped_lock(m_file->m_mutex);
+
+ if (m_1line)
+ {
+ if (gdu_req && gdu_res && gdu_req->which == Z_GDU_Z3950
+ && gdu_res->which == Z_GDU_Z3950)
+ {
+ mp::wrbuf w;
+
+ log_1_line(gdu_req->u.z3950, gdu_res->u.z3950, w);
+ const char *message = wrbuf_cstr(w);
+
+ std::ostringstream os;
+ os << m_msg_config << " "
+ << package << " "
+ << std::fixed << std::setprecision (6) << duration
+ << " "
+ << message;
+ m_file->log(m_time_format, os);
+ }
+ }
+
+ if (m_access)
+ {
+ if (gdu_res)
+ {
+ std::ostringstream os;
+ os << m_msg_config << " "
+ << package << " "
+ << std::fixed << std::setprecision (6) << duration
+ << " "
+ << *gdu_res;
+ m_file->log(m_time_format, os);
+ }
+ }
+ if (m_user_access)
+ {
+ if (gdu_res)
+ {
+ std::ostringstream os;
+ os << m_msg_config << " " << user << " "
+ << package << " "
+ << std::fixed << std::setprecision (6) << duration << " "
+ << *gdu_res;
+ m_file->log(m_time_format, os);
+ }
+ }
+
+ if (m_res_session)
+ {
+ 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)
+ {
+ if (gdu_res && gdu_res->which == Z_GDU_Z3950 &&
+ gdu_res->u.z3950->which == Z_APDU_initResponse)
+ {
+ std::ostringstream os;
+ os << m_msg_config;
+ os << " init options:";
+ yaz_init_opt_decode(gdu_res->u.z3950->u.initResponse->options,
+ option_write, &os);
+ m_file->log(m_time_format, os);
+ }
+ }
+
+ if (m_res_apdu)
+ {
+ if (gdu_res)
+ {
+ mp::odr odr(ODR_PRINT);
+ odr_set_stream(odr, m_file->fhandle, stream_write, 0);
+ z_GDU(odr, &gdu_res, 0, 0);
+ }
+ }
+ }
+ m_file->flush();
+ yaz_timing_destroy(&timer);
+}
+
+
+void yf::Log::Impl::openfile(const std::string &fname)
+{
+ std::list<LFilePtr>::const_iterator it
+ = filter_log_files.begin();
+ for (; it != filter_log_files.end(); it++)
+ {
+ if ((*it)->m_fname == fname)
+ {
+ m_file = *it;
+ return;
+ }
+ }
+ LFilePtr newfile(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)
+{
+ FILE *f = (FILE*) handle;
+ fwrite(buf, len, 1, f ? f : yaz_log_file());
+}
+
+void yf::Log::Impl::option_write(const char *name, void *handle)
+{
+ std::ostringstream *os = (std::ostringstream *) handle;
+ *os << " " << name;
+}
+
+
+yf::Log::Impl::LFile::LFile(std::string fname) :
+ m_fname(fname)
+
+{
+ if (fname.c_str())
+ fhandle = fopen(fname.c_str(), "a");
+ else
+ fhandle = 0;
+}
+
+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()
+{
+ return new mp::filter::Log;