Fix Metaproxy stops logging after check config failed MP-590

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

diff --git a/src/factory_filter.cpp b/src/factory_filter.cpp
index f91eafb..a0c3d6e 100644 (file)
--- a/src/factory_filter.cpp
+++ b/src/factory_filter.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2010 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
@@ -33,7 +33,7 @@ namespace mp = metaproxy_1;
 namespace metaproxy_1 {
     class FactoryFilter::Rep {
         typedef std::map<std::string, CreateFilterCallback> CallbackMap;
-        typedef std::map<std::string, CreateFilterCallback>::iterator 
+        typedef std::map<std::string, CreateFilterCallback>::iterator
             CallbackMapIt;
     public:
         friend class FactoryFilter;
@@ -66,8 +66,8 @@ mp::FactoryFilter::~FactoryFilter()
 
 }
 
-bool mp::FactoryFilter::add_creator(std::string fi,
-                                     CreateFilterCallback cfc)
+bool mp::FactoryFilter::add_creator(const std::string &fi,
+                                    CreateFilterCallback cfc)
 {
     return m_p->m_fcm.insert(Rep::CallbackMap::value_type(fi, cfc)).second;
 }
@@ -81,7 +81,7 @@ bool mp::FactoryFilter::drop_creator(std::string fi)
 bool mp::FactoryFilter::exist(std::string fi)
 {
     Rep::CallbackMap::const_iterator it = m_p->m_fcm.find(fi);
-    
+
     if (it == m_p->m_fcm.end())
     {
         return false;
@@ -92,7 +92,7 @@ bool mp::FactoryFilter::exist(std::string fi)
 mp::filter::Base* mp::FactoryFilter::create(std::string fi)
 {
     Rep::CallbackMap::const_iterator it = m_p->m_fcm.find(fi);
-    
+
     if (it == m_p->m_fcm.end()){
         std::string msg = "filter type '" + fi + "' not found";
             throw NotFound(msg);
@@ -101,15 +101,6 @@ mp::filter::Base* mp::FactoryFilter::create(std::string fi)
     return (it->second());
 }
 
-bool mp::FactoryFilter::have_dl_support()
-{
-#if HAVE_DLFCN_H
-    return true;
-#else
-    return false;
-#endif
-}
-
 bool mp::FactoryFilter::add_creator_dl(const std::string &fi,
                                         const std::string &path)
 {
@@ -118,20 +109,24 @@ bool mp::FactoryFilter::add_creator_dl(const std::string &fi,
     {
         return true;
     }
+    std::string full_name = "metaproxy_1_filter_" + fi;
 
-    std::string full_path = path + "/metaproxy_filter_" + fi + ".so";
-    void *dl_handle = dlopen(full_path.c_str(), RTLD_GLOBAL|RTLD_NOW);
-    if (!dl_handle)
+    void *dl_handle = dlopen(0, RTLD_GLOBAL|RTLD_NOW);
+    void *dlsym_ptr = dlsym(dl_handle, full_name.c_str());
+
+    if (!dlsym_ptr)
     {
-        const char *dl = dlerror();
-        std::cout << "dlopen " << full_path << " failed. dlerror=" << dl << 
-            std::endl;
-        return false;
+        std::string full_path = path + "/metaproxy_filter_" + fi + ".so";
+        dl_handle = dlopen(full_path.c_str(), RTLD_GLOBAL|RTLD_NOW);
+        if (!dl_handle)
+        {
+            const char *dl = dlerror();
+            std::cout << "dlopen " << full_path << " failed. dlerror=" << dl <<
+                std::endl;
+            return false;
+        }
+        dlsym_ptr = dlsym(dl_handle, full_name.c_str());
     }
-
-    std::string full_name = "metaproxy_1_filter_" + fi;
-    
-    void *dlsym_ptr = dlsym(dl_handle, full_name.c_str());
     if (!dlsym_ptr)
     {
         std::cout << "dlsym " << full_name << " failed\n";