Changeset: cf3f1972db4a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cf3f1972db4a
Modified Files:
Branch: sciql
Log Message:
merged with default
diffs (59 lines):
diff --git a/tools/merovingian/daemon/argvcmds.c
b/tools/merovingian/daemon/argvcmds.c
--- a/tools/merovingian/daemon/argvcmds.c
+++ b/tools/merovingian/daemon/argvcmds.c
@@ -339,12 +339,6 @@ command_set(confkeyval *ckv, int argc, c
free(e);
return(1);
}
- kv = findConfKey(ckv, "discoveryport");
- if (kv != NULL && kv->ival == oport && (e = setConfVal(kv, p))
!= NULL) {
- fprintf(stderr, "set: failed to set property
discoveryport: %s\n", e);
- free(e);
- return(1);
- }
kv = findConfKey(ckv, "controlport");
if (kv != NULL && kv->ival == oport + 1) {
oport = atoi(p);
diff --git a/tools/merovingian/daemon/controlrunner.c
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -570,7 +570,7 @@ controlRunner(void *d)
confkeyval *kv;
/* bail out if we don't do
discovery at all */
- kv = findConfKey(_mero_props,
"discoveryport");
+ kv = findConfKey(_mero_props,
"discovery");
if (kv->ival == 0) {
/* can't do much */
len = snprintf(buf2,
sizeof(buf2),
diff --git a/tools/merovingian/daemon/monetdbd.1.in
b/tools/merovingian/daemon/monetdbd.1.in
--- a/tools/merovingian/daemon/monetdbd.1.in
+++ b/tools/merovingian/daemon/monetdbd.1.in
@@ -158,9 +158,8 @@ setting should not be changed.
This property specifies which TCP port
.B monetdbd
should listen to for regular database connection requests. Defaults to
-50000. When this value is changed, discoveryport and controlport are
-changed also, when their values are port and port + 1 for discoveryport
-and controlport respectively. This allows to easily make monetdbd run
+50000. When this value is changed, controlport is also changed when its
+value is port + 1. This allows to easily make monetdbd run
on another port with a single command.
.IP controlport
For remote management of
@@ -170,11 +169,10 @@ the
property specifies the TCP port that is opened up for listening. Note
that for these connections, a passphrase is required, see below.
Defaults to 50001
-.IP discoveryport
-Neighbour discovery is done using UDP broadcasts on the port set by
-.IR discoveryport .
-Setting this property to 0 disables the
-neighbour discovery service entirely. Defaults to 50000.
+.IP discovery
+Specifies whether neighbour discovery is to be enabled using UDP
+broadcasts or not. The broadcasts are done on the same portnumber as
+the port setting.
.IP discoveryttl
.B monetdbd
publishes locally available databases to others periodically. The
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
