Fix Metaproxy stops logging after check config failed MP-590

[metaproxy-moved-to-github.git] / src / package.cpp

diff --git a/src/package.cpp b/src/package.cpp
index 2e3276b..bd8bf7a 100644 (file)
--- a/src/package.cpp
+++ b/src/package.cpp
@@ -1,37 +1,67 @@
-/* $Id: package.cpp,v 1.6 2006-01-11 11:51:50 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) Index Data
 
-%LICENSE%
- */
+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 "config.hpp"
+#include <metaproxy/package.hpp>
+#include <yaz/snprintf.h>
+#include <yaz/log.h>
+
+#include <sstream>
+
+namespace mp = metaproxy_1;
 
-#include "package.hpp"
+namespace metaproxy_1 {
+    class Package::PackageLogger : boost::noncopyable {
+        friend class Package;
+        std::string str;
+    };
+}
 
-yp2::Package::Package() 
-    : m_route_pos(0), m_data(0)
+mp::Package::Package()
+    : m_route_pos(0)
 {
 }
 
-yp2::Package::~Package()
+mp::Package::~Package()
 {
     delete m_route_pos;
 }
 
-yp2::Package::Package(yp2::Session &session, yp2::Origin &origin) 
+mp::Package::Package(mp::Session &session, const mp::Origin &origin)
     : m_session(session), m_origin(origin),
-      m_route_pos(0), m_data(0)
+      m_route_pos(0)
 {
 }
 
-yp2::Package & yp2::Package::copy_filter(const Package &p)
+mp::Package & mp::Package::copy_filter(const Package &p)
 {
-    m_route_pos = p.m_route_pos->clone();
+    p_logger = p.p_logger;
+    copy_route(p);
     return *this;
 }
 
+void mp::Package::copy_route(const Package &p)
+{
+    delete m_route_pos;
+    m_route_pos = p.m_route_pos->clone();
+}
 
-void yp2::Package::move()
+void mp::Package::move()
 {
     if (m_route_pos)
     {
@@ -41,7 +71,7 @@ void yp2::Package::move()
     }
 }
 
-void yp2::Package::move(std::string route)
+void mp::Package::move(std::string route)
 {
     if (m_route_pos)
     {
@@ -53,71 +83,97 @@ void yp2::Package::move(std::string route)
 }
 
 
-yp2::Session & yp2::Package::session()
+mp::Session & mp::Package::session()
 {
     return m_session;
 }
 
-
-int yp2::Package::data() const
+mp::Origin mp::Package::origin() const
 {
-    return m_data;
+    return m_origin;
 }
 
-int & yp2::Package::data()
+mp::Origin & mp::Package::origin()
 {
-    return m_data;
+    return m_origin;
 }
-        
-yp2::Package & yp2::Package::data(const int & data)
+
+mp::Package & mp::Package::router(const mp::Router &router)
 {
-    m_data = data;
+    m_route_pos = router.createpos();
     return *this;
 }
 
-yp2::Origin yp2::Package::origin() const 
+yazpp_1::GDU &mp::Package::request()
 {
-    return m_origin;
+    return m_request_gdu;
 }
-        
-yp2::Origin & yp2::Package::origin()
+
+
+yazpp_1::GDU &mp::Package::response()
 {
-    return m_origin;
+    return m_response_gdu;
 }
 
-yp2::Package & yp2::Package::origin(const Origin & origin)
+mp::Session mp::Package::session() const
 {
-    m_origin = origin;
-    return *this;
+    return m_session;
 }
 
-yp2::Package & yp2::Package::router(const yp2::Router &router)
+std::ostream& std::operator<<(std::ostream& os, const mp::Package& p)
 {
-    m_route_pos = router.createpos();
-    return *this;
+    os << p.origin() << " ";
+    os << p.session().id();
+    return os;
 }
 
-yazpp_1::GDU &yp2::Package::request()
+void mp::Package::log(const char *module, int level, const char *fmt, ...)
 {
-    return m_request_gdu;
+    char buf[4096];
+    va_list ap;
+    va_start(ap, fmt);
+
+    buf[0] = ' ';
+    yaz_vsnprintf(buf + 1, sizeof(buf)-30, fmt, ap);
+
+    std::ostringstream os;
+
+    os << module << " " << *this << buf;
+
+    va_end(ap);
+    yaz_log(level, "%s", os.str().c_str());
+
+    if (p_logger)
+        p_logger->str += std::string(module) + std::string(buf) + std::string("\n");
 }
 
+void mp::Package::log_enable(void)
+{
+    p_logger.reset(new PackageLogger);
+}
 
-yazpp_1::GDU &yp2::Package::response()
+void mp::Package::log_write(const char *buf, size_t sz)
 {
-    return m_response_gdu;
+    if (p_logger)
+        p_logger->str += std::string(buf, sz);
 }
 
-yp2::Session yp2::Package::session() const
+void mp::Package::log_reset(std::string &res)
 {
-    return m_session;
+    if (p_logger)
+    {
+        res = p_logger->str;
+        // p_logger->str.clear();
+        p_logger.reset();
+    }
 }
-                
+
 /*
  * 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
  */
+