Changeset: 1f7c5d074f23 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f7c5d074f23 Modified Files: tools/merovingian/ChangeLog.Apr2012 tools/merovingian/daemon/argvcmds.c Branch: Apr2012 Log Message:
monetdbd: display logfile and pidfile with full path if relative diffs (29 lines): diff --git a/tools/merovingian/ChangeLog.Apr2012 b/tools/merovingian/ChangeLog.Apr2012 --- a/tools/merovingian/ChangeLog.Apr2012 +++ b/tools/merovingian/ChangeLog.Apr2012 @@ -1,3 +1,7 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog +* Fri Mar 9 2012 Fabian Groffen <[email protected]> +- The logfile and pidfile monetdbd properties are now displayed with + dbfarm path when relative + 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 @@ -308,6 +308,14 @@ command_get(confkeyval *ckv, int argc, c } else { value = "no monetdbd is serving this dbfarm"; } + } else if (strcmp(p, "logfile") == 0 || strcmp(p, "pidfile") == 0) { + kv = findConfKey(ckv, p); + if (kv->val != NULL && kv->val[0] != '/') { + snprintf(buf, sizeof(buf), "%s/%s", dbfarm, kv->val); + value = buf; + } else { + value = kv->val; + } } else { kv = findConfKey(ckv, p); if (kv == NULL) { _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
