MonetDB: Jul2017 - Fix monetdb property handling.

[Sjoerd Mullender]

Changeset: f97cded47fa0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f97cded47fa0
Modified Files:
        tools/merovingian/daemon/merovingian.c
        tools/merovingian/utils/properties.c
Branch: Jul2017
Log Message:

Fix monetdb property handling.


diffs (66 lines):

diff --git a/tools/merovingian/daemon/merovingian.c 
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -356,6 +356,8 @@ main(int argc, char *argv[])
        kv->val = strdup("no");
        kv = findConfKey(_mero_db_props, "embedpy");
        kv->val = strdup("no");
+       kv = findConfKey(_mero_db_props, "embedpy3");
+       kv->val = strdup("no");
        kv = findConfKey(_mero_db_props, "nclients");
        kv->val = strdup("64");
        kv = findConfKey(_mero_db_props, "type");
diff --git a/tools/merovingian/utils/properties.c 
b/tools/merovingian/utils/properties.c
--- a/tools/merovingian/utils/properties.c
+++ b/tools/merovingian/utils/properties.c
@@ -31,10 +31,11 @@ static confkeyval _internal_prop_keys[PR
        {"optpipe",  NULL, 0, STR},
        {"readonly", NULL, 0, BOOLEAN},
        {"embedr",   NULL, 0, BOOLEAN},
-       {"embedpy",   NULL, 0, BOOLEAN},
-       {"embedpy3",   NULL, 0, BOOLEAN},
+       {"embedpy",  NULL, 0, BOOLEAN},
+       {"embedpy3", NULL, 0, BOOLEAN},
        {"nclients", NULL, 0, INT},
        {"mfunnel",  NULL, 0, STR},
+       {"dbextra",  NULL, 0, STR},
        { NULL,      NULL, 0, INVALID}
 };
 
@@ -266,22 +267,22 @@ setProp(char *path, char *key, char *val
                                value++;
                        }
                }
+       }
 
-               /* ok, if we've reached this point we can write this stuff out! 
*/
-               /* Let's check if this was a default property of an additional 
one.
-                * Non-default properties will have a NULL kv */
-               if (kv == NULL) {
-                       confkeyval *addProperty = (struct _confkeyval *) 
malloc(sizeof(struct _confkeyval));
-                       addProperty->key = strdup(key);
-                       addProperty->val = strdup(val);
-                       addProperty->ival = 0;
-                       addProperty->type = STR;
+       /* ok, if we've reached this point we can write this stuff out! */
+       /* Let's check if this was a default property of an additional one.
+        * Non-default properties will have a NULL kv */
+       if (kv == NULL) {
+               confkeyval *addProperty = (struct _confkeyval *) 
malloc(sizeof(struct _confkeyval));
+               addProperty->key = strdup(key);
+               addProperty->val = strdup(val);
+               addProperty->ival = 0;
+               addProperty->type = STR;
 
-                       appendProp(addProperty, path);
-                       free(addProperty);
-               } else {
-                       writeProps(props, path);
-               }
+               appendProp(addProperty, path);
+               free(addProperty);
+       } else {
+               writeProps(props, path);
        }
 
        freeConfFile(props);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list