Fix Metaproxy stops logging after check config failed MP-590

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

diff --git a/src/router_chain.cpp b/src/router_chain.cpp
index c9a85fd..fe707c3 100644 (file)
--- a/src/router_chain.cpp
+++ b/src/router_chain.cpp
@@ -1,50 +1,101 @@
-/* $Id: router_chain.cpp,v 1.2 2005-11-10 23:10:42 adam Exp $
-   Copyright (c) 2005, Index Data.
-   
-   %LICENSE%
+/* This file is part of Metaproxy.
+   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
+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 "router_chain.hpp"
+#include <metaproxy/router_chain.hpp>
+#include <metaproxy/filter.hpp>
 
 #include <list>
 
-namespace yp2 
+namespace mp = metaproxy_1;
+
+namespace metaproxy_1
 {
+    class ChainPos;
+
     class RouterChain::Rep {
         friend class RouterChain;
+        friend class RouterChain::Pos;
         std::list<const filter::Base *> m_filter_list;
     };
-};
+    class RouterChain::Pos : public RoutePos {
+    public:
+        virtual const filter::Base *move(const char *route);
+        virtual RoutePos *clone();
+        virtual ~Pos();
+        std::list<const filter::Base *>::const_iterator it;
+        mp::RouterChain::Rep *m_p;
+    };
+}
 
-yp2::RouterChain::RouterChain() : m_p(new yp2::RouterChain::Rep)
+mp::RouterChain::RouterChain() : m_p(new mp::RouterChain::Rep)
 {
 }
 
-yp2::RouterChain::~RouterChain()
+mp::RouterChain::~RouterChain()
 {
 }
 
-const yp2::filter::Base * yp2::RouterChain::move(const filter::Base *filter,                                   const Package *package) const {
+void mp::RouterChain::start()
+{
     std::list<const filter::Base *>::const_iterator it;
-    it = m_p->m_filter_list.begin();
-    if (filter)
-    {
-        for (; it != m_p->m_filter_list.end(); it++)
-            if (*it == filter)
-            {
-                it++;
-                break;
-            }
-    }
+
+    for (it = m_p->m_filter_list.begin(); it != m_p->m_filter_list.end(); it++)
+        (*it)->start();
+}
+
+void mp::RouterChain::stop(int signo)
+{
+    std::list<const filter::Base *>::const_iterator it;
+
+    for (it = m_p->m_filter_list.begin(); it != m_p->m_filter_list.end(); it++)
+        (*it)->stop(signo);
+}
+
+const mp::filter::Base *mp::RouterChain::Pos::move(const char *route)
+{
     if (it == m_p->m_filter_list.end())
-    {
-        //throw RouterException("no routing rules known");
         return 0;
-    }
-    return *it;
+    const mp::filter::Base *f = *it;
+    it++;
+    return f;
 }
 
-yp2::RouterChain & yp2::RouterChain::append(const filter::Base &filter)
+mp::RoutePos *mp::RouterChain::createpos() const
+{
+    mp::RouterChain::Pos *p = new mp::RouterChain::Pos;
+    p->it = m_p->m_filter_list.begin();
+    p->m_p = m_p.get();
+    return p;
+}
+
+mp::RoutePos *mp::RouterChain::Pos::clone()
+{
+    mp::RouterChain::Pos *p = new mp::RouterChain::Pos;
+    p->it = it;
+    p->m_p = m_p;
+    return p;
+}
+
+mp::RouterChain::Pos::~Pos()
+{
+}
+
+mp::RouterChain & mp::RouterChain::append(const filter::Base &filter)
 {
     m_p->m_filter_list.push_back(&filter);
     return *this;
@@ -54,8 +105,9 @@ yp2::RouterChain & yp2::RouterChain::append(const filter::Base &filter)
 /*
  * 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
  */
+