Update of /cvsroot/monetdb/MonetDB5/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8746

Modified Files:
        monetdb5.conf.in 
Log Message:
- Removed Mguardian section, there's no mguardian tool any more.
- Fixed some comments, added note.
- Made Merovingian default to logging to disk, this does require var/log
  to exist though, which is not the case on a stock install for now.


Index: monetdb5.conf.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/conf/monetdb5.conf.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- monetdb5.conf.in    31 Aug 2007 13:45:52 -0000      1.20
+++ monetdb5.conf.in    31 Aug 2007 13:55:38 -0000      1.21
@@ -118,12 +118,6 @@
 # If you leave this unset, some default key is used.
 [EMAIL PROTECTED]@@[EMAIL PROTECTED]
 
-# Mguardian section
-#====================================
-delay=120              #waiting between pinging the server
-# if the guardian process is running, it will automatically
-# restart the server upon failuer and sent an email to the owner
-
 # Merovingian section
 #====================================
 # Merovingian logs messages and errors by default to the stdout and
@@ -132,8 +126,8 @@
 # to a file instead.  It is legitimate to have both mero_msglog and
 # mero_errlog pointing to the same file, as in the default below.
 # Unsetting below defaults will make merovingian log to the screen.
[EMAIL PROTECTED]@/var/log/merovingian.log
[EMAIL PROTECTED]@/var/log/merovingian.log
[EMAIL PROTECTED]@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL PROTECTED]
[EMAIL PROTECTED]@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL PROTECTED]
 #
 # Log messages may not be instantly logged, because the process that
 # writes the message does not flush its buffered stream.  Since
@@ -149,8 +143,8 @@
 # 10 minutes.
 mero_timeinterval=600
 #
-# mservers that were started by Merovingian are not shut down when the
-# Merovingian is shut down.  This behaviour might be undesirable if the
+# mservers that were started by Merovingian are shut down when the
+# Merovingian is shut down.  This behaviour is desirable if the
 # Merovingian is ran as daemon process that represents MonetDB, such as
 # in an init.d script.  Setting the time-out value below to a positive
 # non-zero value will shut down each mserver that was started with a
@@ -158,7 +152,8 @@
 # killed using the SIGKILL signal.  A time-out value of 0 means that no
 # mserver is shut down, meaning they will live on after the Merovingian
 # has shut down.  The default is to shut down all started mservers with
-# a time-out of 7 seconds.
+# a time-out of 7 seconds.  Note that databases under maintenance are
+# never shut down by Merovingian, regardless this setting.
 mero_exittimeout=7
 
 # MAL section


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to