Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory
sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv6441/src/backends/monet5/merovingian
Modified Files:
merovingian.1.in merovingian.c
Log Message:
Hardwire the default location for the logs in the sources, document them
appropriately
Index: merovingian.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/merovingian.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- merovingian.c 24 Mar 2010 12:58:54 -0000 1.73
+++ merovingian.c 14 Apr 2010 09:54:16 -0000 1.74
@@ -449,8 +449,8 @@
{"gdk_dbfarm", NULL, STR},
{"gdk_nr_threads", NULL, INT},
{"sql_optimizer", NULL, STR},
- {"mero_msglog", NULL, STR},
- {"mero_errlog", NULL, STR},
+ {"mero_msglog", GDKstrdup(MERO_LOG), STR},
+ {"mero_errlog", GDKstrdup(MERO_LOG), STR},
{"mero_port", NULL, INT},
{"mero_exittimeout", NULL, INT},
{"mero_pidfile", NULL, STR},
@@ -534,9 +534,17 @@
kv = findConfKey(ckv, "gdk_dbfarm");
dbfarm = replacePrefix(kv ? kv->val : NULL, prefix);
kv = findConfKey(ckv, "mero_msglog");
- _mero_msglogfile = replacePrefix(kv ? kv->val : NULL, prefix);
+ _mero_msglogfile = replacePrefix(kv->val, prefix);
+ if (strcmp(kv->val, "") == 0) { /* has default, must be set */
+ GDKfree(kv->val);
+ kv->val = NULL;
+ }
kv = findConfKey(ckv, "mero_errlog");
- _mero_errlogfile = replacePrefix(kv ? kv->val : NULL, prefix);
+ _mero_errlogfile = replacePrefix(kv->val, prefix);
+ if (strcmp(kv->val, "") == 0) { /* has default, must be set */
+ GDKfree(kv->val);
+ kv->val = NULL;
+ }
kv = findConfKey(ckv, "mero_exittimeout");
if (kv && kv->val != NULL)
_mero_exit_timeout = atoi(kv->val);
Index: merovingian.1.in
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/backends/monet5/merovingian/merovingian.1.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- merovingian.1.in 13 Apr 2010 16:47:48 -0000 1.1
+++ merovingian.1.in 14 Apr 2010 09:54:16 -0000 1.2
@@ -1,7 +1,7 @@
.\" Process this file with
.\" groff -man -Tascii foo.1
.\"
-.TH MEROVINGIAN 1 "SEPTEMBER 2009" Application "MonetDB Applications"
+.TH MEROVINGIAN 1 "APRIL 2010" Application "MonetDB Applications"
.SH NAME
merovingian \- the MonetDB Database Server daemon
.SH SYNOPSIS
@@ -22,7 +22,7 @@
A
.B merovingian
instance manages one local cluster based on the dbfarm specified in the
-.I /etc/monetdb5.conf
+.I @MONETDB5_CONFFILE@
config file. Within this local cluster
.B merovingian
takes care of starting up databases when necessary, and stopping them
@@ -36,7 +36,7 @@
When started,
.B merovingian
runs in the background, sending log messages to
-.IR /var/log/merovingian.log ,
+.IR @MERO_LOG@ ,
until being sent a stop, terminate or interrupt signal. All arguments
given when starting
.B merovingian
@@ -57,15 +57,17 @@
process.
.SH CONFIGURATION
.B merovingian
-defaults to use the configuration file that was placed in the file
+defaults to use the configuration file
+.I @MONETDB5_CONFFILE@
+that was placed in the file
system during installation to control its behaviour. If the environment
variable
.I MONETDB5CONF
is set,
.B merovingian
-uses the value of this variable as configuration file to load. In the
-configuration file the following options can be specified. Most are
-typically to be found under the
+uses the value of this variable as configuration file to load instead.
+In the configuration file the following options can be specified. Most
+are typically to be found under the
.I Merovingian
section in the default configuration file.
.IP gdk_dbfarm
@@ -74,7 +76,7 @@
will monitor.
.IP mero_msglog
.IP mero_errlog
-When both options are unset,
+When both options are set to an empty string,
.B merovingian
logs messages and errors to the stdout and stderr channels on the
caller's console. By setting one or both of the
@@ -86,7 +88,8 @@
.B mero_msglog
and
.B mero_errlog
-pointing to the same file.
+pointing to the same file, which is the default
+.RI ( @MERO_LOG@ ).
.IP mero_pidfile
Location pointing to the pidfile used by
.B merovingian
@@ -317,7 +320,7 @@
The configuration file for MonetDB, located in the system configuration
directory.
.RE
-.I /var/log/merovingian.log
+.I @MERO_LOG@
.RS
The configuration file default location to write log output to.
.SH "SEE ALSO"
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
