tslog: change name log to log_debug

Change-Id: Ib362f0cd385298a20443f90f9d4b78bcad84a8cc
Signed-off-by: sanghyeok.oh <sanghyeok.oh@samsung.com>

diff --git a/src/internal/groups_proxy.cpp b/src/internal/groups_proxy.cpp
index d3e4e55..1ed0453 100644 (file)
--- a/src/internal/groups_proxy.cpp
+++ b/src/internal/groups_proxy.cpp
@@ -30,11 +30,11 @@ std::vector<gid_t> get_groups(const uid_t uid, const gid_t gid) {
        struct passwd pwd;
 
        if (getpwuid_r(uid, &pwd, buf.data(), buf.size(), &user_pw)) {
-               tslog::log("getpwuid_r failed uid:", uid, " gid: ", gid, "\n");
+               tslog::log_error("getpwuid_r failed uid:", uid, " gid: ", gid, "\n");
                return {};
        }
        if (!user_pw) {
-               tslog::log("getpwuid_r failed. no matching password record was found uid:", uid, " gid: ", gid, "\n");
+               tslog::log_error("getpwuid_r failed. no matching password record was found uid:", uid, " gid: ", gid, "\n");
                return {};
        }
 
@@ -49,7 +49,7 @@ std::vector<gid_t> get_groups(const uid_t uid, const gid_t gid) {
        auto groups = std::vector<gid_t> (ngroups);
        int r = getgrouplist(user_pw->pw_name, gid, groups.data(), &ngroups);
        if (r < 0) {
-               tslog::log("getgrouplist failed uid:", uid, " gid: ", gid, "\n");
+               tslog::log_error("getgrouplist failed uid:", uid, " gid: ", gid, "\n");
                groups.clear();
        }
        return groups;

diff --git a/src/internal/storage_backend_serialized.cpp b/src/internal/storage_backend_serialized.cpp
index b6b7409..f5c03e1 100644 (file)
--- a/src/internal/storage_backend_serialized.cpp
+++ b/src/internal/storage_backend_serialized.cpp
@@ -67,7 +67,7 @@ void StorageBackendSerialized::StorageBackendSerializedImpl::releaseMMap() {
        assert(0 != length);
 
        if (munmap(mem, length) != 0)
-               tslog::log("munmap(): ", tslog::print_errno(errno), "\n");
+               tslog::log_error("munmap(): ", tslog::print_errno(errno), "\n");
 
        mem = static_cast<decltype(mem)>(MAP_FAILED);
        length = 0;
@@ -77,7 +77,7 @@ void StorageBackendSerialized::StorageBackendSerializedImpl::releaseFD() {
        assert(-1 != fd);
 
        if (close(fd) != 0)
-               tslog::log("close(): ", tslog::print_errno(errno), "\n");
+               tslog::log_error("close(): ", tslog::print_errno(errno), "\n");
 
        fd = -1;
 }
@@ -99,7 +99,7 @@ bool StorageBackendSerialized::StorageBackendSerializedImpl::init(const char *fi
        assert(nullptr == file);
 
        auto err = [filename] (const char *what) {
-               tslog::log("Can't ", what, " ", filename, ": ", tslog::print_errno(errno), "\n");
+               tslog::log_error("Can't ", what, " ", filename, ": ", tslog::print_errno(errno), "\n");
                return false;
        };
 
@@ -116,7 +116,7 @@ bool StorageBackendSerialized::StorageBackendSerializedImpl::init(const char *fi
 
        length = buf.st_size;
        if (length > MAX_SFILE_SIZE) {
-               tslog::log("Serialized file size(", length, ") is too large. (>", MAX_SFILE_SIZE, ") bytes.\n");
+               tslog::log_error("Serialized file size(", length, ") is too large. (>", MAX_SFILE_SIZE, ") bytes.\n");
                return false;
        }
 
@@ -129,7 +129,7 @@ bool StorageBackendSerialized::StorageBackendSerializedImpl::init(const char *fi
        if (verify) {
                auto verifier = flatbuffers::Verifier(mem, length);
                if (!FB::VerifyFileBuffer(verifier)) {
-                       tslog::log("verification of serialized data: failed\n");
+                       tslog::log_error("verification of serialized data: failed\n");
                        return false;
                }
        }

diff --git a/src/internal/storage_backend_xml.cpp b/src/internal/storage_backend_xml.cpp
index 95ee1b6..ec1b494 100644 (file)
--- a/src/internal/storage_backend_xml.cpp
+++ b/src/internal/storage_backend_xml.cpp
@@ -138,7 +138,7 @@ template <typename T>
 void StorageBackendXML::addItem(const ldp_xml_parser::PolicyType policy_type,
                                                                const ldp_xml_parser::PolicyTypeValue policy_type_value,
                                                                T &item) {
-       tslog::log("Add item: ", item, ", decision: ", item.getDecision(), "\n");
+       tslog::log_debug("Add item: ", item, ", decision: ", item.getDecision(), "\n");
        pimpl->getPolicySetFromMatchItem<typename T::match_type>().addItem(policy_type, policy_type_value, item);
 }
 

diff --git a/src/internal/tslog.cpp b/src/internal/tslog.cpp
index 06ba0c0..28a9808 100644 (file)
--- a/src/internal/tslog.cpp
+++ b/src/internal/tslog.cpp
@@ -47,19 +47,19 @@ void flush(ldp_log_level level) {
 
 void logError(const std::string &error)
 {
-       log(error, "\n");
+       log_error(error, "\n");
        LOGE("%s", error.c_str());
 }
 
 void logWarning(const std::string &warning)
 {
-       log(warning, "\n");
+       log_warning(warning, "\n");
        LOGW("%s", warning.c_str());
 }
 
 void logDebug(const std::string &debug)
 {
-       log(debug, "\n");
+       log_debug(debug, "\n");
        LOGD("%s", debug.c_str());
 }
 

diff --git a/src/internal/tslog.hpp b/src/internal/tslog.hpp
index f2b4f59..f04fd16 100644 (file)
--- a/src/internal/tslog.hpp
+++ b/src/internal/tslog.hpp
@@ -59,7 +59,7 @@ namespace tslog
        }
 
        template <typename ...Args>
-       void log(const Args &...args) { if (enabled(ldp_log_level::DEBUG)) log_to_stream(std::cout, args...); }
+       void log_debug(const Args &...args) { if (enabled(ldp_log_level::DEBUG)) log_to_stream(std::cout, args...); }
 
        template <typename ...Args>
        void log_error(const Args &...args) { if (enabled(ldp_log_level::ERROR)) log_to_stream(std::cout, args...); }

diff --git a/src/internal/xml_parser.cpp b/src/internal/xml_parser.cpp
index 984dd53..77d0619 100644 (file)
--- a/src/internal/xml_parser.cpp
+++ b/src/internal/xml_parser.cpp
@@ -186,7 +186,7 @@ void XmlParser::elementEnd(const char *el) {
 }
 
 int XmlParser::parsePolicyConfigFile() {
-       tslog::log("XmlParser::parsePolicyConfigFile called with filename: ", main_filename, "\n");
+       tslog::log_debug("XmlParser::parsePolicyConfigFile called with filename: ", main_filename);
        parsePolicyConfigFileInternal(main_filename);
        return ret_code;
 }
@@ -250,7 +250,7 @@ std::unique_ptr<char[]> file2str(const char *filename) {
 void XmlParser::parseXmlFile(const char *filename) {
        included_files.clear();
 
-       tslog::log("Processing: ", filename, " ...\n");
+       tslog::log_debug("Processing: ", filename, " ...\n");
        tslog::log_verbose("=== XML PARSING BEGIN === : ", filename, '\n');
 
        curr_dir = getDir(filename);
@@ -297,7 +297,7 @@ void XmlParser::getIncludedFiles(const std::string& parent_dir, const std::strin
                        std::cout << '\n';
                }
        } else {
-               tslog::log("could not open directory ", dname, '\n');
+               tslog::log_error("could not open directory ", dname, '\n');
        }
 }