DB store plugin params unified

diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_mysql.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_mysql.conf
index 475b5f27a23f7125bc66ce528c5c585231c3ddd5..4cd2c0dedb1cbad2aba0c192b40c92a0e4118261 100644 (file)
--- a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_mysql.conf
+++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_mysql.conf
@@ -3,23 +3,23 @@
     # Parameter: required
     # Value: IP address or DNS name
     # Default: localhost
     # Parameter: required
     # Value: IP address or DNS name
     # Default: localhost

-    dbhost = localhost
+    server = localhost

 
     # Database name
     # Parameter: required
     # Value: any, supported by database
     # Default: stg
 
     # Database name
     # Parameter: required
     # Value: any, supported by database
     # Default: stg

-    dbname = stg
+    database = stg

 
     # Database username
     # Parameter: required
     # Value: any, supported by database
     # Default: stg
 
     # Database username
     # Parameter: required
     # Value: any, supported by database
     # Default: stg

-    dbuser = stg
+    user = stg

 
     # Database password
     # Parameter: required
     # Value: any, supported by database
     # Default: 123456
 
     # Database password
     # Parameter: required
     # Value: any, supported by database
     # Default: 123456

-    rootdbpass = 123456
-</StoreModule>
\ No newline at end of file
+    password = 123456
+</StoreModule>

diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_mysql.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_mysql.conf
index 475b5f27a23f7125bc66ce528c5c585231c3ddd5..4cd2c0dedb1cbad2aba0c192b40c92a0e4118261 100644 (file)
--- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_mysql.conf
+++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_mysql.conf
@@ -3,23 +3,23 @@
     # Parameter: required
     # Value: IP address or DNS name
     # Default: localhost
     # Parameter: required
     # Value: IP address or DNS name
     # Default: localhost

-    dbhost = localhost
+    server = localhost

 
     # Database name
     # Parameter: required
     # Value: any, supported by database
     # Default: stg
 
     # Database name
     # Parameter: required
     # Value: any, supported by database
     # Default: stg

-    dbname = stg
+    database = stg

 
     # Database username
     # Parameter: required
     # Value: any, supported by database
     # Default: stg
 
     # Database username
     # Parameter: required
     # Value: any, supported by database
     # Default: stg

-    dbuser = stg
+    user = stg

 
     # Database password
     # Parameter: required
     # Value: any, supported by database
     # Default: 123456
 
     # Database password
     # Parameter: required
     # Value: any, supported by database
     # Default: 123456

-    rootdbpass = 123456
-</StoreModule>
\ No newline at end of file
+    password = 123456
+</StoreModule>

diff --git a/projects/stargazer/plugins/store/mysql/mysql_store.cpp b/projects/stargazer/plugins/store/mysql/mysql_store.cpp
index ac5818d584223bc9524f2699dd027084692adb2a..54e13f864deaebe8eeeca50420f821b3b16d897c 100644 (file)
--- a/projects/stargazer/plugins/store/mysql/mysql_store.cpp
+++ b/projects/stargazer/plugins/store/mysql/mysql_store.cpp
@@ -153,13 +153,17 @@ return 0;
 //-----------------------------------------------------------------------------
 int MYSQL_STORE_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {
 //-----------------------------------------------------------------------------
 int MYSQL_STORE_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {

-if (ParseParam(s.moduleParams, "dbuser", dbUser) < 0)
+if (ParseParam(s.moduleParams, "user", dbUser) < 0 &&
+    ParseParam(s.moduleParams, "dbuser", dbUser) < 0)

     return -1;
     return -1;

-if (ParseParam(s.moduleParams, "rootdbpass", dbPass) < 0)
+if (ParseParam(s.moduleParams, "password", dbPass) < 0 &&
+    ParseParam(s.moduleParams, "rootdbpass", dbPass) < 0)

     return -1;
     return -1;

-if (ParseParam(s.moduleParams, "dbname", dbName) < 0)
+if (ParseParam(s.moduleParams, "database", dbName) < 0 &&
+    ParseParam(s.moduleParams, "dbname", dbName) < 0)

     return -1;
     return -1;

-if (ParseParam(s.moduleParams, "dbhost", dbHost) < 0)
+if (ParseParam(s.moduleParams, "server", dbHost) < 0 &&
+    ParseParam(s.moduleParams, "dbhost", dbHost) < 0)

     return -1;
 
 return 0;
     return -1;
 
 return 0;