Vasum client wrapper epoch fix, remove unwanted logging

[Bug/Feature]   Missing epoch in spec, too many logging messages
[Cause]         N/A
[Solution]      Add epoch, remove unwanted logging
[Verification]  Build, install on target, check journal

Change-Id: Ie18565a52e2d0fbf6e2089c3c122a30c5bd1e6e1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e960c6..05fbc53 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,9 @@
 CMAKE_MINIMUM_REQUIRED (VERSION 2.6.2)
 PROJECT(vasum)
 
+IF(NOT DEFINED VERSION)
+    SET(VERSION "0.1.1")
+ENDIF(NOT DEFINED VERSION)
 
 ## pkgconfig ###################################################################
 INCLUDE(FindPkgConfig)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index e366e3c..47db767 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -21,7 +21,7 @@ MESSAGE(STATUS "")
 MESSAGE(STATUS "Generating makefile for the Client...")
 ## set client library sources (without vasum-wrapper.cpp)
 FILE(GLOB project_SRCS *.cpp *.hpp *.h)
-FILE(GLOB project_SRCS_rm vasum-wrapper.cpp)
+FILE(GLOB project_SRCS_rm vasum-wrapper.cpp wrapper-compat.* vasum.h vasum_list.h)
 LIST(REMOVE_ITEM project_SRCS ${project_SRCS_rm})
 
 ## set wrapper library sources (without vasum-client.cpp)
@@ -36,7 +36,7 @@ FILE(GLOB common_SRCS ${COMMON_FOLDER}/epoll/*.hpp              ${COMMON_FOLDER}
                       ${COMMON_FOLDER}/*.hpp                    ${COMMON_FOLDER}/*.cpp)
 
 ## set version highier then vasum.so.0.1.0
-SET(_LIB_VERSION_ "0.1.1")
+SET(_LIB_VERSION_ "${VERSION}")
 SET(_LIB_SOVERSION_ "0")
 SET(PC_FILE "${PROJECT_NAME}.pc")
 
@@ -53,7 +53,7 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME}-client PROPERTIES
         VERSION ${_LIB_VERSION_}
         COMPILE_DEFINITIONS HOST_IPC_SOCKET="${VSM_SERVER_IPC_SOCKET_PATH}")
 
-ADD_LIBRARY(${PROJECT_NAME} SHARED ${wrapper_SRCS} ${common_SRCS})
+ADD_LIBRARY(${PROJECT_NAME} SHARED ${wrapper_SRCS})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
         SOVERSION ${_LIB_SOVERSION_}
         VERSION ${_LIB_VERSION_}

diff --git a/client/vasum-client-impl.cpp b/client/vasum-client-impl.cpp
index 9694dd3..bbc7e9e 100644 (file)
--- a/client/vasum-client-impl.cpp
+++ b/client/vasum-client-impl.cpp
@@ -177,9 +177,6 @@ VsmStatus Client::coverException(const function<void(void)>& worker) noexcept
     } catch (const exception& ex) {
         mStatus = Status(VSMCLIENT_CUSTOM_ERROR, ex.what());
     }
-    if (mStatus.mVsmStatus!=VSMCLIENT_SUCCESS) {
-        LOGE("Exception: " << mStatus.mMsg);
-    }
     return mStatus.mVsmStatus;
 }
 

diff --git a/libs/config/CMakeLists.txt b/libs/config/CMakeLists.txt
index 377b734..87c2af1 100644 (file)
--- a/libs/config/CMakeLists.txt
+++ b/libs/config/CMakeLists.txt
@@ -25,7 +25,7 @@ FILE(GLOB HEADERS           *.hpp)
 FILE(GLOB HEADERS_SQLITE3   ${CMAKE_CURRENT_BINARY_DIR}/sqlite3/*.hpp)
 FILE(GLOB_RECURSE SRCS      *.cpp *.hpp)
 
-SET(_LIB_VERSION_ "0.0.1")
+SET(_LIB_VERSION_ "${VERSION}")
 SET(_LIB_SOVERSION_ "0")
 SET(PC_FILE "lib${PROJECT_NAME}.pc")
 

diff --git a/libs/dbus/CMakeLists.txt b/libs/dbus/CMakeLists.txt
index cd2c06c..840b3b4 100644 (file)
--- a/libs/dbus/CMakeLists.txt
+++ b/libs/dbus/CMakeLists.txt
@@ -32,7 +32,7 @@ FILE(GLOB SRCS_UTILS    ${COMMON_FOLDER}/utils/callback-guard.cpp
                         ${COMMON_FOLDER}/utils/callback-wrapper.cpp)
 FILE(GLOB SRCS          *.cpp *.hpp)
 
-SET(_LIB_VERSION_ "0.0.1")
+SET(_LIB_VERSION_ "${VERSION}")
 SET(_LIB_SOVERSION_ "0")
 SET(PC_FILE "lib${PROJECT_NAME}.pc")
 

diff --git a/libs/logger/CMakeLists.txt b/libs/logger/CMakeLists.txt
index 786f8bc..6b3352d 100644 (file)
--- a/libs/logger/CMakeLists.txt
+++ b/libs/logger/CMakeLists.txt
@@ -24,7 +24,7 @@ MESSAGE(STATUS "Generating makefile for the libLogger...")
 FILE(GLOB HEADERS   *.hpp)
 FILE(GLOB SRCS      *.cpp *.hpp)
 
-SET(_LIB_VERSION_ "0.0.1")
+SET(_LIB_VERSION_ "${VERSION}")
 SET(_LIB_SOVERSION_ "0")
 SET(PC_FILE "lib${PROJECT_NAME}.pc")
 

diff --git a/packaging/vasum.spec b/packaging/vasum.spec
index c2b6eb9..07b2f0c 100644 (file)
--- a/packaging/vasum.spec
+++ b/packaging/vasum.spec
@@ -128,9 +128,9 @@ Library interface to the vasum daemon
 %files client
 %manifest packaging/libvasum-client.manifest
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvasum-client.so.0.1.1
+%attr(755,root,root) %{_libdir}/libvasum-client.so.%{version}
 %{_libdir}/libvasum-client.so.0
-%attr(755,root,root) %{_libdir}/libvasum.so.0.1.1
+%attr(755,root,root) %{_libdir}/libvasum.so.%{version}
 %{_libdir}/libvasum.so.0
 
 %post client -p /sbin/ldconfig
@@ -142,8 +142,8 @@ Library interface to the vasum daemon
 %package devel
 Summary:          Vasum Client Devel
 Group:            Development/Libraries
-Requires:         vasum = %{version}-%{release}
-Requires:         vasum-client = %{version}-%{release}
+Requires:         vasum = %{epoch}:%{version}-%{release}
+Requires:         vasum-client = %{epoch}:%{version}-%{release}
 
 %description devel
 Development package including the header files for the client library
@@ -175,7 +175,7 @@ Zones support installed inside every zone.
 %package zone-daemon
 Summary:          Vasum Zones Daemon
 Group:            Security/Other
-Requires:         vasum-zone-support = %{version}-%{release}
+Requires:         vasum-zone-support = %{epoch}:%{version}-%{release}
 
 %description zone-daemon
 Daemon running inside every zone.
@@ -191,7 +191,7 @@ Daemon running inside every zone.
 %package cli
 Summary:          Vasum Command Line Interface
 Group:            Security/Other
-Requires:         vasum-client = %{version}-%{release}
+Requires:         vasum-client = %{epoch}:%{version}-%{release}
 
 %description cli
 Command Line Interface for vasum.
@@ -203,7 +203,7 @@ Command Line Interface for vasum.
 %package cli-completion
 Summary:          Vasum Command Line Interface bash completion
 Group:            Security/Other
-Requires:         vasum-cli = %{version}-%{release}
+Requires:         vasum-cli = %{epoch}:%{version}-%{release}
 #Requires:         bash-completion
 
 %description cli-completion
@@ -216,8 +216,8 @@ Command Line Interface bash completion.
 %package tests
 Summary:          Vasum Tests
 Group:            Development/Libraries
-Requires:         vasum = %{version}-%{release}
-Requires:         vasum-client = %{version}-%{release}
+Requires:         vasum = %{epoch}:%{version}-%{release}
+Requires:         vasum-client = %{epoch}:%{version}-%{release}
 Requires:         python
 Requires:         python-xml
 Requires:         boost-test
@@ -270,7 +270,7 @@ The package provides libLogger library.
 %files -n libLogger
 %defattr(644,root,root,755)
 %{_libdir}/libLogger.so.0
-%attr(755,root,root) %{_libdir}/libLogger.so.0.0.1
+%attr(755,root,root) %{_libdir}/libLogger.so.%{version}
 
 %package -n libLogger-devel
 Summary:        Development logger library
@@ -303,7 +303,7 @@ The package provides libSimpleDbus library.
 %files -n libSimpleDbus
 %defattr(644,root,root,755)
 %{_libdir}/libSimpleDbus.so.0
-%attr(755,root,root) %{_libdir}/libSimpleDbus.so.0.0.1
+%attr(755,root,root) %{_libdir}/libSimpleDbus.so.%{version}
 
 %package -n libSimpleDbus-devel
 Summary:        Development Simple dbus library
@@ -337,7 +337,7 @@ The package provides libConfig library.
 %files -n libConfig
 %defattr(644,root,root,755)
 %{_libdir}/libConfig.so.0
-%attr(755,root,root) %{_libdir}/libConfig.so.0.0.1
+%attr(755,root,root) %{_libdir}/libConfig.so.%{version}
 
 %package -n libConfig-devel
 Summary:        Development Config library