atria-soft/exml
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update of external of elog and ethread

Browse Source
This commit is contained in:
Edouard DUPIN 2016-03-08 21:29:34 +01:00
parent 21694e2e50
commit ef8c280458
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exml/debug.cpp
View File

@ -9,7 +9,7 @@
#include <exml/debug.h> #include <exml/debug.h>
int32_t exml::getLogId() { int32_t exml::getLogId() {
static int32_t g_val = etk::log::registerInstance("exml"); static int32_t g_val = elog::registerInstance("exml");
return g_val; return g_val;
} }

4
exml/debug.h
View File

@ -7,12 +7,12 @@
*/ */
#pragma once #pragma once
#include <etk/log.h> #include <elog/log.h>
namespace exml { namespace exml {
int32_t getLogId(); int32_t getLogId();
}; };
#define EXML_BASE(info,data) TK_LOG_BASE(exml::getLogId(),info,data) #define EXML_BASE(info,data) ELOG_BASE(exml::getLogId(),info,data)
#define EXML_CRITICAL(data) EXML_BASE(1, data) #define EXML_CRITICAL(data) EXML_BASE(1, data)
#define EXML_ERROR(data) EXML_BASE(2, data) #define EXML_ERROR(data) EXML_BASE(2, data)

16
test/main.cpp
View File

@ -24,23 +24,23 @@ int main(int argc, const char *argv[]) {
// init Google test : // init Google test :
::testing::InitGoogleTest(&argc, const_cast<char **>(argv)); ::testing::InitGoogleTest(&argc, const_cast<char **>(argv));
// the only one init for etk: // the only one init for etk:
etk::log::setLevel(etk::log::logLevelNone); elog::setLevel(elog::logLevelNone);
for (int32_t iii=0; iii<argc ; ++iii) { for (int32_t iii=0; iii<argc ; ++iii) {
std::string data = argv[iii]; std::string data = argv[iii];
if (data == "-l0") { if (data == "-l0") {
etk::log::setLevel(etk::log::logLevelNone); elog::setLevel(elog::logLevelNone);
} else if (data == "-l1") { } else if (data == "-l1") {
etk::log::setLevel(etk::log::logLevelCritical); elog::setLevel(elog::logLevelCritical);
} else if (data == "-l2") { } else if (data == "-l2") {
etk::log::setLevel(etk::log::logLevelError); elog::setLevel(elog::logLevelError);
} else if (data == "-l3") { } else if (data == "-l3") {
etk::log::setLevel(etk::log::logLevelWarning); elog::setLevel(elog::logLevelWarning);
} else if (data == "-l4") { } else if (data == "-l4") {
etk::log::setLevel(etk::log::logLevelInfo); elog::setLevel(elog::logLevelInfo);
} else if (data == "-l5") { } else if (data == "-l5") {
etk::log::setLevel(etk::log::logLevelDebug); elog::setLevel(elog::logLevelDebug);
} else if (data == "-l6") { } else if (data == "-l6") {
etk::log::setLevel(etk::log::logLevelVerbose); elog::setLevel(elog::logLevelVerbose);
} else if ( data == "-h" } else if ( data == "-h"
|| data == "--help") { || data == "--help") {
std::cout << "Help : " <<std::endl; std::cout << "Help : " <<std::endl;