Просмотр исходного кода

Se agregan valores por defecto para conexiones de amqp y mysql

Espinoza Guillermo 6 лет назад
Родитель
Сommit
84bb6d198f
2 измененных файлов с 30 добавлено и 22 удалено
  1. 13 10
      hooks/amqp/src/load.cc
  2. 17 12
      hooks/mysql/src/load.cc

+ 13 - 10
hooks/amqp/src/load.cc

@@ -17,21 +17,24 @@ extern "C" {
 
 int load(LibraryHandle& handle)
 {
+    // seteo valores por defecto
+    host = "amqp";
+    user = "guest";
+    password = "guest";
+    
     ConstElementPtr hostPtr = handle.getParameter("host");
     ConstElementPtr userPtr = handle.getParameter("user");
     ConstElementPtr passwordPtr = handle.getParameter("password");
 
-    if (
-        hostPtr->getType() != Element::string ||
-        userPtr->getType() != Element::string ||
-        passwordPtr->getType() != Element::string
-    ) {
-        return 1;
+    if (hostPtr && hostPtr->getType() == Element::string) {
+        host = hostPtr->stringValue();
+    }
+    if (userPtr && userPtr->getType() == Element::string) {
+        user = userPtr->stringValue();
+    }
+    if (passwordPtr && passwordPtr->getType() == Element::string) {
+        password = passwordPtr->stringValue();
     }
-
-    host = hostPtr->stringValue();
-    user = userPtr->stringValue();
-    password = passwordPtr->stringValue();
 
     return 0;
 }

+ 17 - 12
hooks/mysql/src/load.cc

@@ -21,24 +21,29 @@ extern "C" {
 
 int load(LibraryHandle& handle)
 {
+    // seteo valores por defecto
+    host = "mysql";
+    database = "fd3_dhcp";
+    user = "root";
+    password = "235r2342gtfsw";
+    
     ConstElementPtr hostPtr = handle.getParameter("host");
     ConstElementPtr databasePtr = handle.getParameter("database");
     ConstElementPtr userPtr = handle.getParameter("user");
     ConstElementPtr passwordPtr = handle.getParameter("password");
 
-    if (
-        hostPtr->getType() != Element::string ||
-        databasePtr->getType() != Element::string ||
-        userPtr->getType() != Element::string ||
-        passwordPtr->getType() != Element::string
-    ) {
-        return 1;
+    if (hostPtr && hostPtr->getType() == Element::string) {
+        host = hostPtr->stringValue();
+    }
+    if (databasePtr && databasePtr->getType() == Element::string) {
+        database = databasePtr->stringValue();
+    }
+    if (userPtr && userPtr->getType() == Element::string) {
+        user = userPtr->stringValue();
+    }
+    if (passwordPtr && passwordPtr->getType() == Element::string) {
+        password = passwordPtr->stringValue();
     }
-
-    host = hostPtr->stringValue();
-    database = databasePtr->stringValue();
-    user = userPtr->stringValue();
-    password = passwordPtr->stringValue();
 
     return 0;
 }