[Carob-commits] CVS update of libmysequoia/src (CarobMySQL.cpp)

[marc]

    Date: Monday, May 7, 2007 @ 14:59:13
  Author: marc
    Path: /cvsroot/carob/libmysequoia/src

Modified: CarobMySQL.cpp (1.108 -> 1.109)

Logging config filenames


----------------+
 CarobMySQL.cpp |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)


Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.108 
libmysequoia/src/CarobMySQL.cpp:1.109
--- libmysequoia/src/CarobMySQL.cpp:1.108       Fri May  4 16:28:56 2007
+++ libmysequoia/src/CarobMySQL.cpp     Mon May  7 14:59:12 2007
@@ -1150,6 +1150,19 @@
 //  LOG4CXX_DEBUG(logger, "Leaving delete_row_data.");
 }
 
+namespace {
+// this should probably be a real method
+void
+parseConfigFile(log4cxx::LoggerPtr& logger, IniParser &ini, std::string 
fileName)
+{
+  if (ini.parseFile(fileName.c_str())) {
+    LOG4CXX_INFO(logger,  "config file " << fileName << " parsed");
+  } else {
+    LOG4CXX_INFO(logger, "ignoring config file " << fileName << " not found");
+  }
+}
+}
+
 void
 CarobMYSQL::read_ini_file()
 {
@@ -1173,26 +1186,26 @@
   if (conf_dir)
   {
     string s = string(conf_dir) + "/" + MYSEQUOIA_CONFIG_FILE;
-    ini.parseFile(s.c_str());
+    parseConfigFile(logger, ini, s.c_str());
   }
   else
   {
-    ini.parseFile(DEFAULT_MYSEQUOIA_CONFIG_FILE);
+    parseConfigFile(logger, ini, DEFAULT_MYSEQUOIA_CONFIG_FILE);
   }
 
 /* 2 */
   if (home_dir)
   {
     string s = string(home_dir) + "/." + MYSEQUOIA_CONFIG_FILE;
-    ini.parseFile(s.c_str());
+    parseConfigFile(logger, ini, s.c_str());
   }
 
 /* 3 */
-  ini.parseFile(MYSEQUOIA_CONFIG_FILE);
+  parseConfigFile(logger, ini, MYSEQUOIA_CONFIG_FILE);
 
 /* 4 */
   if (mysqlPtr->options.my_cnf_file)
-    ini.parseFile(mysqlPtr->options.my_cnf_file);
+    parseConfigFile(logger, ini, mysqlPtr->options.my_cnf_file);
 
   if (mysqlPtr->options.my_cnf_group && *mysqlPtr->options.my_cnf_group)
     group = mysqlPtr->options.my_cnf_group;

_______________________________________________
Carob-commits mailing list
Carob-commits@lists.forge.continuent.org
https://forge.continuent.org/mailman/listinfo/carob-commits