Failsafe when Servus implementation can't created and fallback to dum…

…my (#80)
HBPVIS · Oct 11, 2017 · 2e9a23a · 2e9a23a
1 parent 8d47578
commit 2e9a23a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/CMake/common b/CMake/common
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,7 +56,10 @@ add_subdirectory(apps)
 add_subdirectory(tests)
 
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libavahi-client3, avahi-daemon")
+set(SERVUS_PACKAGE_DEB_DEPENDS)
+if (avahi-client_FOUND)
+  list(APPEND SERVUS_PACKAGE_DEB_DEPENDS libavahi-client3 avahi-daemon)
+endif()
 include(CommonCPack)
 
 set(COMMON_PROJECT_DOMAIN eu.humanbrainproject)

diff --git a/doc/Changelog.md b/doc/Changelog.md
@@ -3,6 +3,8 @@
 
 # git master
 
+* [80](https://github.com/HBPVis/Servus/pull/80):
+  Failsafe when Servus implementation can't be created and fallback to dummy.
 * [77](https://github.com/HBPVis/Servus/pull/77):
   Add test driver implementation for Servus
 * [76](https://github.com/HBPVis/Servus/pull/76):

diff --git a/servus/servus.cpp b/servus/servus.cpp
@@ -193,12 +193,21 @@ std::unique_ptr<Servus::Impl> _chooseImplementation(const std::string& name)
 {
     if (name == TEST_DRIVER)
         return std::unique_ptr<Servus::Impl>(new test::Servus);
+    try
+    {
 #ifdef SERVUS_USE_DNSSD
-    return std::unique_ptr<Servus::Impl>(new dnssd::Servus(name));
+        return std::unique_ptr<Servus::Impl>(new dnssd::Servus(name));
 #elif defined(SERVUS_USE_AVAHI_CLIENT)
-    return std::unique_ptr<Servus::Impl>(new avahi::Servus(name));
+        return std::unique_ptr<Servus::Impl>(new avahi::Servus(name));
 #endif
-    return std::unique_ptr<Servus::Impl>(new none::Servus(name));
+        return std::unique_ptr<Servus::Impl>(new none::Servus(name));
+    }
+    catch (const std::runtime_error& error)
+    {
+        std::cerr << "Error starting Servus client: " << error.what()
+                  << std::endl;
+        return std::unique_ptr<Servus::Impl>(new servus::none::Servus(name));
+    }
 }
 }
+30 −2		CHANGES.md
+2 −8		Common.cmake
+1 −1		CommonCPPCTest.cmake
+5 −7		CommonCPack.cmake
+21 −4		CommonFindPackage.cmake
+117 −51		CommonGraph.cmake
+30 −0		CommonInstallProject.cmake
+1 −2		CommonPythonCTest.cmake
+1 −0		DoxygenRule.cmake
+3 −1		FindLibJpegTurbo.cmake
+6 −124		GitExternal.cmake
+2 −20		README.md
+36 −33		SubProject.cmake
+0 −7		UpdateGitExternal.cmake
+2 −7		cpp/version.cpp
+8 −0		cpp/version.h
+1 −1		util/git_pre-commit.in