Changeset: fe7342895c6a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe7342895c6a
Modified Files:
tools/merovingian/daemon/argvcmds.c
Branch: Apr2011
Log Message:
monetdbd: send SIGHUP to monetdbd process after set command
As documented in the manpage, send SIGHUP to the monetdbd process for
the dbfarm we've updated upon issuing the set command.
diffs (56 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
@@ -232,6 +232,9 @@
char *property;
char *dbfarm = LOCALSTATEDIR "/monetdb5/dbfarm";
confkeyval *kv;
+ FILE *pfile = NULL;
+ char buf[8];
+ pid_t meropid;
if (argc < 2 || argc > 3) {
command_help(2, &argv[-1]);
@@ -296,9 +299,9 @@
kv = findConfKey(ckv, "controlport");
if (kv != NULL && kv->ival == oport + 1) {
oport = atoi(p);
- p = alloca(8);
- snprintf(p, 8, "%d", oport + 1);
+ snprintf(buf, sizeof(buf), "%d", oport + 1);
property = "controlport";
+ p = buf;
}
}
if ((p = setConfVal(kv, p)) != NULL) {
@@ -312,6 +315,30 @@
return(1);
}
+ property = getConfVal(ckv, "pidfile");
+
+ /* chdir to dbfarm so we can open relative files (like pidfile) */
+ if (chdir(dbfarm) < 0) {
+ fprintf(stderr, "could not move to dbfarm '%s': %s\n",
+ dbfarm, strerror(errno));
+ return(1);
+ }
+
+ if ((pfile = fopen(property, "r")) != NULL &&
+ fgets(buf, sizeof(buf), pfile) != NULL)
+ {
+ meropid = atoi(buf);
+ if (meropid != 0) {
+ if (kill(meropid, SIGHUP) == -1) {
+ fprintf(stderr, "sending SIGHUP to monetdbd[%d]
failed: %s\n",
+ (int)meropid, strerror(errno));
+ return(1);
+ }
+ }
+ }
+ if (pfile != NULL)
+ fclose(pfile);
+
return(0);
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
