Upgrade casablanca version and the spdlog version, Support for HPC-ACM.

This commit is contained in:
Evan Cui 2018-05-14 23:18:22 +08:00
Родитель bf9d5bf9ff
Коммит ab17941387
4 изменённых файлов: 13 добавлений и 19 удалений

Просмотреть файл

@ -592,6 +592,11 @@ namespace hpc
"Fixed a bug that task would fail when cgroup is not enabled",
}
},
{ "3.1.1.0",
{
"Support for HPC-ACM.",
}
},
};
return versionHistory;

Просмотреть файл

@ -1,7 +1,7 @@
# node manager makefile.
# casablanca
CASABLANCA = ../../evancasa/cpprestsdk
CASABLANCA = ../../casa
CASA_RELEASE = $(CASABLANCA)/Release
CASA_INC = $(CASA_RELEASE)/include
CASA_LIB_DEBUG = $(CASA_RELEASE)/build.debug/Binaries

Просмотреть файл

@ -4,7 +4,7 @@ using namespace hpc::utils;
Logger::Logger()
{
loggers.push_back(spdlog::stdout_logger_mt("console"));
loggers.push_back(spdlog::stdout_color_mt("console"));
loggers.push_back(spdlog::rotating_logger_mt("nodemanager", "logs/nodemanager", 1048576 * 5, 100));
spdlog::set_level(spdlog::level::debug);

Просмотреть файл

@ -15,14 +15,12 @@ namespace hpc
{
enum class LogLevel
{
Emergency = 0, /* system is unusable */
Alert = 1, /* action must be taken immediately */
Critical = 2, /* critical conditions */
Error = 3, /* error conditions */
Warning = 4, /* warning conditions */
Notice = 5, /* normal but significant condition */
Info = 6, /* informational */
Debug = 7 /* debug-level messages */
Critical = 0, /* critical conditions */
Error = 1, /* error conditions */
Warning = 2, /* warning conditions */
Info = 3, /* informational */
Debug = 4, /* debug-level messages */
Trace = 5 /* the most verbose messages */
};
class Logger
@ -92,12 +90,6 @@ namespace hpc
{
switch (level)
{
case LogLevel::Emergency:
logger->emerg(fmt, args...);
break;
case LogLevel::Alert:
logger->alert(fmt, args...);
break;
case LogLevel::Critical:
logger->critical(fmt, args...);
break;
@ -107,9 +99,6 @@ namespace hpc
case LogLevel::Warning:
logger->warn(fmt, args...);
break;
case LogLevel::Notice:
logger->notice(fmt, args...);
break;
case LogLevel::Info:
logger->info(fmt, args...);
break;