Changeset: b215b05c5c79 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b215b05c5c79
Modified Files:
tools/merovingian/daemon/merovingian.c
Branch: Feb2013
Log Message:
merovingian: refuse to startup when properties are missing
dbfarms that we can't read .merovingian_properties from are either
messed up in terms of permissions, or created by a simple mkdir, such as
in bug #3398. Refuse starting up since this affects any other
operations on monetdbd (although it functions just fine), such as
shutdown via monetdbd stop ....
diffs (16 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
@@ -660,7 +660,11 @@ main(int argc, char *argv[])
}
/* read the merovingian properties from the dbfarm */
- readProps(ckv, ".");
+ if (readProps(ckv, ".") != 0) {
+ Mfprintf(stderr, "cannot find or read properties file, was "
+ "this dbfarm created by `monetdbd create`?\n");
+ MERO_EXIT_CLEAN(1);
+ }
_mero_props = ckv;
pidfilename = getConfVal(_mero_props, "pidfile");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
