Changeset: 5c7a10ceb231 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5c7a10ceb231
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (51 lines):
diff -r a4492dce5fce -r 5c7a10ceb231
sql/src/backends/monet5/merovingian/ChangeLog.Jun2010
--- a/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Thu Jul 01
15:01:02 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Thu Jul 01
15:02:41 2010 +0200
@@ -1,7 +1,12 @@
# ChangeLog file for sql/src/backends/monet5/merovingian
# This file is updated with mchangelog
-#*June2010
+ 01 Jul 2010; Fabian Groffen <fab...@cwi.nl> merovingian.c:
+ When a startup failure causes a shutdown, make sure we log this
+ incident in the logfile, together with a message that the deamon was
+ shut down due to this fatal condition.
+
+*Jun2010
01 Jun 2010; Fabian Groffen <fab...@cwi.nl> merovingian.c, utils.c:
Fixed an issue where Merovingian's strict umask was applied too early
diff -r a4492dce5fce -r 5c7a10ceb231
sql/src/backends/monet5/merovingian/merovingian.c
--- a/sql/src/backends/monet5/merovingian/merovingian.c Thu Jul 01 15:01:02
2010 +0200
+++ b/sql/src/backends/monet5/merovingian/merovingian.c Thu Jul 01 15:02:41
2010 +0200
@@ -518,8 +518,11 @@
if (write(retfd, &s, 1) != 1 || close(retfd) != 0) { \
Mfprintf(stderr, "could not write to parent\n"); \
} \
- if (status != 0) \
- return(status); \
+ if (status != 0) { \
+ Mfprintf(stderr, "fatal startup condition encountered, " \
+ "aborting startup\n"); \
+ goto shutdown; \
+ } \
}
readConfFile(ckv, cnf);
@@ -1000,13 +1003,14 @@
if (e != NO_ERR) {
/* console */
- Mfprintf(stderr, "%s\n", argv[0], e);
Mfprintf(oerr, "%s: %s\n", argv[0], e);
- MERO_EXIT(1);
/* logfile */
Mfprintf(stderr, "%s\n", e);
+ MERO_EXIT(1);
}
+shutdown:
+
/* we don't need merovingian itself */
d = d->next;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
