Enable dlog only when the vist is running on Tizen

Signed-off-by: Sangwan Kwon <sangwan.kwon@samsung.com>

diff --git a/src/vist/CMakeLists.txt b/src/vist/CMakeLists.txt
index 30d8026..65b8c3c 100644 (file)
--- a/src/vist/CMakeLists.txt
+++ b/src/vist/CMakeLists.txt
@@ -24,6 +24,7 @@ IF(DEFINED GBS_BUILD)
        SET(DEPENDENCY sqlite3 dlog gflags)
        PKG_CHECK_MODULES(VIST_COMMON_DEPS REQUIRED ${DEPENDENCY})
        INCLUDE_DIRECTORIES(${VIST_COMMON_DEPS_INCLUDE_DIRS})
+       ADD_DEFINITIONS(-DTIZEN="TIZEN")
 ENDIF(DEFINED GBS_BUILD)
 
 INCLUDE_DIRECTORIES(SYSTEM . common ${VIST_COMMON_DEPS_INCLUDE_DIRS})

diff --git a/src/vist/client/CMakeLists.txt b/src/vist/client/CMakeLists.txt
index 0cf045c..0655f15 100644 (file)
--- a/src/vist/client/CMakeLists.txt
+++ b/src/vist/client/CMakeLists.txt
@@ -18,9 +18,7 @@ ADD_VIST_CLIENT_LIBRARY(vist_client query.cpp
                                                                        virtual-table.cpp)
 
 FILE(GLOB CLIENT_TESTS "tests/*.cpp")
-#IF(DEFINED GBS_BUILD)
-       ADD_VIST_TEST(${CLIENT_TESTS})
-       #ENDIF(DEFINED GBS_BUILD)
+ADD_VIST_TEST(${CLIENT_TESTS})
 
 ADD_LIBRARY(${TARGET_VIST_CLIENT_LIB} STATIC ${${TARGET_VIST_CLIENT_LIB}_SRCS})
 TARGET_LINK_LIBRARIES(${TARGET_VIST_CLIENT_LIB} ${VIST_CLIENT_DEPS_LIBRARIES}

diff --git a/src/vist/client/query.cpp b/src/vist/client/query.cpp
index 5b1cbed..dcb84bd 100644 (file)
--- a/src/vist/client/query.cpp
+++ b/src/vist/client/query.cpp
@@ -30,7 +30,7 @@ Rows Query::Execute(const std::string& statement)
        INFO(VIST_CLIENT) << "Query execution: " << statement;
        rmi::Remote remote(SOCK_ADDR);
 
-       auto query = REMOTE_METHOD(remote, &Vist::query);
+       auto query = REMOTE_METHOD(remote, &Vistd::query);
        return query.invoke<Rows>(statement);
 }
 

diff --git a/src/vist/main/main.cpp b/src/vist/main/main.cpp
index 8e64bbc..3288acc 100644 (file)
--- a/src/vist/main/main.cpp
+++ b/src/vist/main/main.cpp
@@ -14,17 +14,26 @@
  *  limitations under the License
  */
 
-#include <vist/service/vist.hpp>
+#include <vist/service/vistd.hpp>
 
 #include <vist/exception.hpp>
 #include <vist/logger.hpp>
 
 #include <cstdlib>
 
+#ifdef TIZEN
+#include <vist/logger/dlog.hpp>
+#endif
+
 using namespace vist;
 
 int main() try {
-       Vist::Instance().start();
+#ifdef TIZEN
+       LogStream::Init(std::make_shared<Dlog>());
+#endif
+
+       Vistd::Instance().start();
+
        return EXIT_SUCCESS;
 } catch(const Exception<ErrCode>& e) {
        ERROR(VIST) << "Failed while daemon is running." << e.what();

diff --git a/src/vist/service/CMakeLists.txt b/src/vist/service/CMakeLists.txt
index ee1c427..983e1d2 100644 (file)
--- a/src/vist/service/CMakeLists.txt
+++ b/src/vist/service/CMakeLists.txt
@@ -12,7 +12,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License
 
-ADD_VIST_LIBRARY(vist_core vist.cpp)
+ADD_VIST_LIBRARY(vist_core vistd.cpp)
 
 FILE(GLOB CORE_TESTS "tests/*.cpp")
 ADD_VIST_TEST(${CORE_TESTS})

diff --git a/src/vist/service/tests/core.cpp b/src/vist/service/tests/core.cpp
index 35a518d..8b32945 100644 (file)
--- a/src/vist/service/tests/core.cpp
+++ b/src/vist/service/tests/core.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include <vist/service/vist.hpp>
+#include <vist/service/vistd.hpp>
 #include <vist/policy/api.hpp>
 
 #include <iostream>
@@ -29,12 +29,12 @@ class CoreTests : public testing::Test {};
 
 TEST_F(CoreTests, query_select)
 {
-       auto rows = Vist::Query("SELECT * FROM policy");
+       auto rows = Vistd::Query("SELECT * FROM policy");
 
        EXPECT_TRUE(rows.size() > 0);
 
        std::string statement = "SELECT * FROM policy WHERE name = 'sample-int-policy'";
-       rows = Vist::Query(statement);
+       rows = Vistd::Query(statement);
 
        EXPECT_EQ(rows.size(), 1);
        EXPECT_EQ(rows[0]["name"], "sample-int-policy");
@@ -45,16 +45,16 @@ TEST_F(CoreTests, query_update)
        policy::API::Admin::Enroll("admin");
 
        std::string statement = "SELECT * FROM policy WHERE name = 'sample-int-policy'";
-       auto rows = Vist::Query(statement);
+       auto rows = Vistd::Query(statement);
        /// Initial policy value
        EXPECT_EQ(rows[0]["value"], "I/7");
 
        statement = "UPDATE policy SET value = 'I/10' WHERE name = 'sample-int-policy'";
-       rows = Vist::Query(statement);
+       rows = Vistd::Query(statement);
        EXPECT_EQ(rows.size(), 0);
 
        statement = "SELECT * FROM policy WHERE name = 'sample-int-policy'";
-       rows = Vist::Query(statement);
+       rows = Vistd::Query(statement);
        EXPECT_EQ(rows[0]["value"], "I/10");
 
        policy::API::Admin::Disenroll("admin");

diff --git a/src/vist/service/vist.cpp b/src/vist/service/vistd.cpp
similarity index 86%
rename from src/vist/service/vist.cpp
rename to src/vist/service/vistd.cpp
index be4b68c..0c16cff 100644 (file)
--- a/src/vist/service/vist.cpp
+++ b/src/vist/service/vistd.cpp
@@ -14,7 +14,7 @@
  *  limitations under the License
  */
 
-#include "vist.hpp"
+#include "vistd.hpp"
 
 #include <vist/rmi/gateway.hpp>
 #include <vist/logger.hpp>
@@ -29,21 +29,21 @@ namespace {
 
 namespace vist {
 
-Vist::Vist()
+Vistd::Vistd()
 {
        osquery::registryAndPluginInit();
 }
 
-void Vist::start()
+void Vistd::start()
 {
-       INFO(VIST) << "Vist daemon starts.";
+       INFO(VIST) << "Vistd daemon starts.";
        rmi::Gateway gateway(SOCK_ADDR);
 
-       EXPOSE(gateway, this, &Vist::query);
+       EXPOSE(gateway, this, &Vistd::query);
        gateway.start();
 }
 
-Rows Vist::query(const std::string& statement)
+Rows Vistd::query(const std::string& statement)
 {
        osquery::SQL sql(statement, true);
        if (!sql.ok())

diff --git a/src/vist/service/vist.hpp b/src/vist/service/vistd.hpp
similarity index 77%
rename from src/vist/service/vist.hpp
rename to src/vist/service/vistd.hpp
index ab8b8df..e5f4bb3 100644 (file)
--- a/src/vist/service/vist.hpp
+++ b/src/vist/service/vistd.hpp
@@ -25,34 +25,34 @@ namespace vist {
 using Row = std::map<std::string, std::string>;
 using Rows = std::vector<Row>;
 
-class Vist final {
+class Vistd final {
 public:
-       ~Vist() = default;
+       ~Vistd() = default;
 
-       Vist(const Vist&) = delete;
-       Vist& operator=(const Vist&) = delete;
+       Vistd(const Vistd&) = delete;
+       Vistd& operator=(const Vistd&) = delete;
 
-       Vist(Vist&&) = default;
-       Vist& operator=(Vist&&) = default;
+       Vistd(Vistd&&) = default;
+       Vistd& operator=(Vistd&&) = default;
 
        /// Exposed method (API)
        Rows query(const std::string& statement);
 
-       static Vist& Instance()
+       static Vistd& Instance()
        {
-               static Vist instance;
+               static Vistd instance;
                return instance;
        }
 
        static Rows Query(const std::string& statement)
        {
-               return Vist::Instance().query(statement);
+               return Vistd::Instance().query(statement);
        }
 
        void start();
 
 private:
-       explicit Vist();
+       explicit Vistd();
 };
 
 } // namespace vist