feature/cli-runner (#90)

* Add DlError for CLI runner

* Fix logging in HelloWorld component for cli runner.

Author: brosenberg42

detection/examples/HelloWorldComponent/HelloWorld.cpp

@@ -27,7 +27,6 @@
 #include <map>
 #include <iostream>
 #include <detectionComponentUtils.h>
-#include <log4cxx/xml/domconfigurator.h>
 
 #include "HelloWorld.h"
 
@@ -42,7 +41,6 @@ using namespace MPF::COMPONENT;
         run_directory = ".";
     }
 
-    log4cxx::xml::DOMConfigurator::configure(run_directory + "/HelloWorldComponent/config/Log4cxxConfig.xml");
     hw_logger_ = log4cxx::Logger::getLogger("HelloWorldSample");
     LOG4CXX_INFO(hw_logger_, "Running in directory \"" << run_directory << "\"");
 

detection/examples/HelloWorldComponent/StreamingHelloWorld.cpp

@@ -25,7 +25,6 @@
  ******************************************************************************/
 
 
-#include <log4cxx/xml/domconfigurator.h>
 #include <detectionComponentUtils.h>
 
 #include "StreamingHelloWorld.h"
@@ -35,20 +34,14 @@ using namespace MPF::COMPONENT;
 
 StreamingHelloWorld::StreamingHelloWorld(const MPFStreamingVideoJob &job)
         : MPFStreamingDetectionComponent(job)
-        , hw_logger_(GetLogger(job.run_directory))
+        , hw_logger_(log4cxx::Logger::getLogger("StreamingHelloWorldSample"))
         , job_name_(job.job_name)
         , confidence_threshold_(DetectionComponentUtils::GetProperty(job.job_properties, "CONFIDENCE_THRESHOLD", -1.0))
 {
     LOG4CXX_INFO(hw_logger_, "[" << job_name_ << "] Initialized StreamingHelloWorld component.")
 }
 
 
-log4cxx::LoggerPtr StreamingHelloWorld::GetLogger(const std::string &run_directory) {
-    log4cxx::xml::DOMConfigurator::configure(run_directory + "/HelloWorldComponent/config/Log4cxxConfig.xml");
-    return log4cxx::Logger::getLogger("StreamingHelloWorldSample");
-}
-
-
 void StreamingHelloWorld::BeginSegment(const VideoSegmentInfo &segment_info) {
     LOG4CXX_INFO(hw_logger_, "[" << job_name_ << "] Preparing to process segment " << segment_info.segment_number)
     segment_detections_.clear();

detection/examples/HelloWorldComponent/StreamingHelloWorld.h

@@ -61,8 +61,6 @@ class StreamingHelloWorld : public MPF::COMPONENT::MPFStreamingDetectionComponen
     double confidence_threshold_;
 
     std::vector<MPF::COMPONENT::MPFVideoTrack> segment_detections_;
-
-    static log4cxx::LoggerPtr GetLogger(const std::string &run_directory);
 };
 
 

detection/examples/HelloWorldComponent/plugin-files/config/Log4cxxConfig.xml

@@ -27,9 +27,13 @@
 #ifndef OPENMPF_CPP_COMPONENT_SDK_DLCLASSLOADER_H
 #define OPENMPF_CPP_COMPONENT_SDK_DLCLASSLOADER_H
 
-#include <string>
-#include <memory>
 #include <dlfcn.h>
+
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <utility>
+
 #include <MPFDetectionException.h>
 
 
@@ -49,6 +53,14 @@ namespace MPF { namespace COMPONENT {
     };
 
 
+    class DlError : public MPFDetectionException {
+    public:
+        explicit DlError(const std::string &what)
+            : MPFDetectionException(MPF_DETECTION_NOT_INITIALIZED, what) {
+        }
+    };
+
+
     template <typename DlClass>
     class DlClassLoader {
     public:
@@ -94,7 +106,7 @@ namespace MPF { namespace COMPONENT {
                     const std::string &deleter_func_name,
                     CreatorArgs&&... args) {
             if (lib_handle == nullptr) {
-                throw std::runtime_error("Failed to open \"" + lib_path + "\" due to: " + dlerror());
+                throw DlError("Failed to open \"" + lib_path + "\" due to: " + dlerror());
             }
 
             auto create_instance_fn = LoadFunction<creator_func_t<CreatorArgs...>>(lib_handle, creator_func_name);
@@ -126,7 +138,7 @@ namespace MPF { namespace COMPONENT {
         static TFunc* LoadFunction(void* lib_handle, const std::string &symbol_name) {
             auto result = reinterpret_cast<TFunc*>(dlsym(lib_handle, symbol_name.c_str()));
             if (result == nullptr) {
-                throw std::runtime_error("dlsym failed for " + symbol_name + ": " + dlerror());
+                throw DlError("dlsym failed for " + symbol_name + ": " + dlerror());
             }
             return result;
         }