Changeset: 1c0be37daaf8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1c0be37daaf8
Modified Files:
tools/merovingian/daemon/forkmserver.c
Branch: Jul2017
Log Message:
If dbextra is present as a property monetdbd should pass it to the mserver
diffs (42 lines):
diff --git a/tools/merovingian/daemon/forkmserver.c
b/tools/merovingian/daemon/forkmserver.c
--- a/tools/merovingian/daemon/forkmserver.c
+++ b/tools/merovingian/daemon/forkmserver.c
@@ -407,6 +407,7 @@ forkMserver(char *database, sabdb** stat
if (pid == 0) {
char *sabdbfarm;
char dbpath[1024];
+ char dbextra_path[1024];
char port[24];
char muri[512]; /* possibly undersized */
char usock[512];
@@ -417,6 +418,7 @@ forkMserver(char *database, sabdb** stat
char *readonly = NULL;
char *embeddedr = NULL;
char *embeddedpy = NULL;
+ char *dbextra = NULL;
char *argv[512]; /* for the exec arguments */
char property_other[1024];
int c = 0;
@@ -478,6 +480,10 @@ forkMserver(char *database, sabdb** stat
}
embeddedpy = "embedded_py=3";
}
+ kv = findConfKey(ckv, "dbextra");
+ if (kv->val != NULL) {
+ dbextra = kv->val;
+ }
@@ -504,6 +510,11 @@ forkMserver(char *database, sabdb** stat
argv[c++] = _mero_mserver;
argv[c++] = dbpath;
argv[c++] = "--set"; argv[c++] = muri;
+ if (dbextra != NULL) {
+ snprintf(dbextra_path, sizeof(dbextra_path),
+ "--dbextra=%s", dbextra);
+ argv[c++] = dbextra_path;
+ }
if (mydoproxy == 1) {
struct sockaddr_un s; /* only for sizeof(s.sun_path) :(
*/
argv[c++] = "--set"; argv[c++] = "mapi_open=false";
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
