Changeset: cd5d207d4978 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cd5d207d4978
Modified Files:
tools/merovingian/daemon/forkmserver.c
Branch: Nov2019
Log Message:
allow passing obscure features to the mserver using an environment variable
MSERVER5_EXTRA_ARGS
diffs (36 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
@@ -177,6 +177,9 @@ terminateProcess(pid_t pid, char *dbname
* to see if forking makes sense, or whether it is necessary at all, or
* forbidden by restart policy, e.g. when in maintenance.
*/
+
+#define MAX_NR_ARGS 511
+
err
forkMserver(char *database, sabdb** stats, int force)
{
@@ -212,7 +215,9 @@ forkMserver(char *database, sabdb** stat
char *embeddedc = NULL;
char *ipv6 = NULL;
char *dbextra = NULL;
- char *argv[512]; /* for the exec arguments */
+ char *mserver5_extra = NULL;
+ char *mserver5_extra_token = NULL;
+ char *argv[MAX_NR_ARGS+1]; /* for the exec arguments */
char property_other[1024];
int c = 0;
unsigned int mport;
@@ -602,6 +607,11 @@ forkMserver(char *database, sabdb** stat
list++;
}
+ /* Let's get extra mserver5 args from the environment */
+ mserver5_extra = getenv("MSERVER5_EXTRA_ARGS");
+ while (c < MAX_NR_ARGS && (mserver5_extra_token =
strsep(&mserver5_extra, " ")))
+ argv[c++] = mserver5_extra_token;
+
argv[c++] = NULL;
freeConfFile(ckv);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
