kou commented on code in PR #47645:
URL: https://github.com/apache/arrow/pull/47645#discussion_r2380678507
##########
cpp/src/arrow/flight/sql/odbc/flight_sql/flight_sql_driver.cc:
##########
@@ -63,45 +45,33 @@ odbcabstraction::Diagnostics&
FlightSqlDriver::GetDiagnostics() { return diagnos
void FlightSqlDriver::SetVersion(std::string version) { version_ =
std::move(version); }
void FlightSqlDriver::RegisterLog() {
- odbcabstraction::PropertyMap propertyMap;
- driver::odbcabstraction::ReadConfigFile(propertyMap, CONFIG_FILE_NAME);
-
- auto log_enable_iterator = propertyMap.find(SPDLogger::LOG_ENABLED);
- auto log_enabled = log_enable_iterator != propertyMap.end()
- ? odbcabstraction::AsBool(log_enable_iterator->second)
- : false;
- if (!log_enabled) {
- return;
- }
-
- auto log_path_iterator = propertyMap.find(SPDLogger::LOG_PATH);
- auto log_path = log_path_iterator != propertyMap.end() ?
log_path_iterator->second : "";
- if (log_path.empty()) {
+ std::string log_level_str = arrow::internal::GetEnvVar(kODBCLogLevel)
+ .Map(arrow::internal::AsciiToLower)
+ .Map(arrow::internal::TrimString)
+ .ValueOr("");
+ if (log_level_str.empty()) {
return;
}
- auto log_level_iterator = propertyMap.find(SPDLogger::LOG_LEVEL);
- auto log_level = ToLogLevel(log_level_iterator != propertyMap.end()
- ? std::stoi(log_level_iterator->second)
- : 1);
- if (log_level == odbcabstraction::LogLevel_OFF) {
- return;
+ auto log_level = ArrowLogLevel::ARROW_DEBUG;
+
+ if (log_level_str == "fatal") {
+ log_level = ArrowLogLevel::ARROW_FATAL;
+ } else if (log_level_str == "error") {
+ log_level = ArrowLogLevel::ARROW_ERROR;
+ } else if (log_level_str == "warning") {
+ log_level = ArrowLogLevel::ARROW_WARNING;
+ } else if (log_level_str == "info") {
+ log_level = ArrowLogLevel::ARROW_INFO;
+ } else if (log_level_str == "debug") {
+ log_level = ArrowLogLevel::ARROW_DEBUG;
+ } else if (log_level_str == "trace") {
+ log_level = ArrowLogLevel::ARROW_TRACE;
}
- auto maximum_file_size_iterator =
propertyMap.find(SPDLogger::MAXIMUM_FILE_SIZE);
- auto maximum_file_size = maximum_file_size_iterator != propertyMap.end()
- ? std::stoi(maximum_file_size_iterator->second)
- : DEFAULT_MAXIMUM_FILE_SIZE;
-
- auto maximum_file_quantity_iterator =
propertyMap.find(SPDLogger::FILE_QUANTITY);
- auto maximum_file_quantity = maximum_file_quantity_iterator !=
propertyMap.end()
- ?
std::stoi(maximum_file_quantity_iterator->second)
- : 1;
-
- std::unique_ptr<odbcabstraction::SPDLogger> logger(new
odbcabstraction::SPDLogger());
-
- logger->init(maximum_file_quantity, maximum_file_size, log_path, log_level);
- odbcabstraction::Logger::SetInstance(std::move(logger));
+ // Enable driver logging. Log files are not supported on Windows yet, since
GLOG is not
+ // tested fully on Windows.
+ arrow::util::ArrowLog::StartArrowLog("arrow-flight-sql-odbc", log_level);
Review Comment:
Can we call paired `arrow::util::ArrowLog::ShutdownArrowLog()`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
