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 23c745a..bd8bf7a 100644 (file)
--- a/src/package.cpp
+++ b/src/package.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2011 Index Data
+   Copyright (C) Index Data
 
 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
@@ -25,7 +25,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 namespace mp = metaproxy_1;
 
-mp::Package::Package() 
+namespace metaproxy_1 {
+    class Package::PackageLogger : boost::noncopyable {
+        friend class Package;
+        std::string str;
+    };
+}
+
+mp::Package::Package()
     : m_route_pos(0)
 {
 }
@@ -35,20 +42,24 @@ mp::Package::~Package()
     delete m_route_pos;
 }
 
-mp::Package::Package(mp::Session &session, const mp::Origin &origin) 
+mp::Package::Package(mp::Session &session, const mp::Origin &origin)
     : m_session(session), m_origin(origin),
       m_route_pos(0)
 {
 }
 
-
 mp::Package & mp::Package::copy_filter(const Package &p)
 {
-    delete m_route_pos;
-    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 mp::Package::move()
 {
@@ -77,11 +88,11 @@ mp::Session & mp::Package::session()
     return m_session;
 }
 
-mp::Origin mp::Package::origin() const 
+mp::Origin mp::Package::origin() const
 {
     return m_origin;
 }
-    
+
 mp::Origin & mp::Package::origin()
 {
     return m_origin;
@@ -116,22 +127,47 @@ std::ostream& std::operator<<(std::ostream& os, const mp::Package& p)
     return os;
 }
 
-void mp::Package::log(const char *module, int level, const char *fmt, ...) const
+void mp::Package::log(const char *module, int level, const char *fmt, ...)
 {
     char buf[4096];
     va_list ap;
     va_start(ap, fmt);
 
-    yaz_vsnprintf(buf, sizeof(buf)-30, fmt, ap);
+    buf[0] = ' ';
+    yaz_vsnprintf(buf + 1, sizeof(buf)-30, fmt, ap);
 
     std::ostringstream os;
 
-    os << module << " " << *this << " " << buf;
+    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);
+}
+
+void mp::Package::log_write(const char *buf, size_t sz)
+{
+    if (p_logger)
+        p_logger->str += std::string(buf, sz);
+}
+
+void mp::Package::log_reset(std::string &res)
+{
+    if (p_logger)
+    {
+        res = p_logger->str;
+        // p_logger->str.clear();
+        p_logger.reset();
+    }
+}
+
 /*
  * Local variables:
  * c-basic-offset: 4