Changeset: b3b05eb9a4b3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3b05eb9a4b3
Modified Files:
tools/merovingian/daemon/merovingian.c
Branch: default
Log Message:
merovingian: declare discovery
Fixup for previous commit.
diffs (21 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
@@ -485,6 +485,7 @@ main(int argc, char *argv[])
int socku = -1;
unsigned short port = 0;
unsigned short controlport = 0;
+ char discovery = 0;
struct stat sb;
FILE *oerr = NULL;
pthread_mutexattr_t mta;
@@ -752,6 +753,9 @@ main(int argc, char *argv[])
}
controlport = (unsigned short)kv->ival;
+ kv = findConfKey(_mero_props, "discovery");
+ discovery = kv->ival;
+
/* set up UNIX socket paths for control and mapi */
p = getConfVal(_mero_props, "sockdir");
snprintf(control_usock, sizeof(control_usock), "%s/" CONTROL_SOCK "%d",
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
