调整GPS值;TWAIN组件退出时关闭日志对象;日志开始结尾增加进程ID信息
This commit is contained in:
parent
8c118223b1
commit
368a339bb2
|
@ -72,7 +72,7 @@ void offline_opts::init(void)
|
|||
INIT_SIMPLE_VAL(CO_URL, BRAND_COMPANY_URL);
|
||||
INIT_SIMPLE_VAL(CO_TEL, BRAND_COMPANY_TEL);
|
||||
INIT_SIMPLE_VAL(CO_ADDR, BRAND_COMPANY_ADDRESS);
|
||||
INIT_SIMPLE_VAL(CO_GPS, BRAND_COMPANY_GPS);
|
||||
INIT_SIMPLE_VAL(CO_GPS, BRAND_URL_GPS);
|
||||
|
||||
INIT_SIMPLE_VAL(COPYRIGHT, BRAND_COPYRIGHT);
|
||||
INIT_SIMPLE_VAL(DRIVER_VERSION, drv_ver_.c_str());
|
||||
|
|
|
@ -235,7 +235,7 @@ class log_cls
|
|||
}
|
||||
|
||||
std::string now("[" + utils::format_current_time() + "]: =====================================");
|
||||
now += truncate ? "--truncated--=====================================\n" : "--started--=====================================\n";
|
||||
now += truncate ? "--truncated--=====================================\n" : "--started--" + std::to_string(GetCurrentProcessId()) + "=====================================\n";
|
||||
fwrite(now.c_str(), sizeof(now[0]), now.length(), file_);
|
||||
}
|
||||
|
||||
|
@ -1064,7 +1064,7 @@ namespace utils
|
|||
}
|
||||
void uninit(void)
|
||||
{
|
||||
log_info("=====================================--Exited--=====================================\n\n\n\n", LOG_LEVEL_FATAL);
|
||||
log_info(("=====================================--Exited--" + std::to_string(GetCurrentProcessId()) + "=====================================\n\n\n\n").c_str(), LOG_LEVEL_FATAL);
|
||||
|
||||
log_cls::clear();
|
||||
}
|
||||
|
|
|
@ -1578,6 +1578,7 @@ extern "C"
|
|||
if(sane_helper_)
|
||||
delete sane_helper_;
|
||||
sane_helper_ = nullptr;
|
||||
utils::uninit();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue