MonetDB: default - merovingian: properly cope with relative path...

[Fabian Groffen]

Changeset: 055f7551230f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=055f7551230f
Modified Files:
        tools/merovingian/daemon/merovingian.c
Branch: default
Log Message:

merovingian: properly cope with relative paths to dbfarms

Because we move into the given dbfarm, we can operate for everything in
the current directory.  If we don't, this actually breaks because the
relative path will be looked for inside itself.


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
@@ -599,7 +599,7 @@
        }
 
        /* read the merovingian properties from the dbfarm */
-       readProps(ckv, dbfarm);
+       readProps(ckv, ".");
        _mero_props = ckv;
 
        kv = findConfKey(_mero_props, "pidfile");
@@ -612,7 +612,7 @@
                Mfprintf(stderr, "invalid forwarding mode: %s, defaulting to 
proxy\n",
                                kv->val);
                setConfVal(kv, "proxy");
-               writeProps(_mero_props, dbfarm);
+               writeProps(_mero_props, ".");
        }
 
        kv = findConfKey(_mero_props, "passphrase");
@@ -624,7 +624,7 @@
                        generateSalt(phrase, sizeof(phrase));
                        setConfVal(kv, phrase);
                }
-               writeProps(_mero_props, dbfarm);
+               writeProps(_mero_props, ".");
        }
 
        kv = findConfKey(_mero_props, "port");
@@ -632,7 +632,7 @@
                Mfprintf(stderr, "invalid port number: %s, defaulting to %s\n",
                                kv->val, MERO_PORT);
                setConfVal(kv, MERO_PORT);
-               writeProps(_mero_props, dbfarm);
+               writeProps(_mero_props, ".");
        }
        port = (unsigned short)kv->ival;
        kv = findConfKey(_mero_props, "discoveryport");
@@ -640,7 +640,7 @@
                Mfprintf(stderr, "invalid discovery port number: %s, defaulting 
to %s\n",
                                kv->val, MERO_PORT);
                setConfVal(kv, MERO_PORT);
-               writeProps(_mero_props, dbfarm);
+               writeProps(_mero_props, ".");
        }
        discoveryport = (unsigned int)kv->ival;
        kv = findConfKey(_mero_props, "controlport");
@@ -648,7 +648,7 @@
                Mfprintf(stderr, "invalid control port number: %s, defaulting 
to %s\n",
                                kv->val, CONTROL_PORT);
                setConfVal(kv, CONTROL_SOCK);
-               writeProps(_mero_props, dbfarm);
+               writeProps(_mero_props, ".");
        }
        controlport = (unsigned short)kv->ival;
 
@@ -824,7 +824,7 @@
                        MERO_VERSION, MONETDB_RELEASE);
        Mfprintf(stdout, "monitoring dbfarm %s\n", dbfarm);
 
-       msab_init(dbfarm, NULL);
+       msab_init(".", NULL);
        unlink(control_usock);
        unlink(mapi_usock);
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list