Changeset 824

Timestamp:

03/26/2006 07:37:13 AM (3 years ago)

Author:

mtaylor

Message:

Added "RESCANCONFIGS" config option. Defaults to original behavior.

This option allows the disabling of Eddie's constant scanning and reloading
if its config files.

Location:

eddie/trunk

Files:

• bin/eddie.py (modified) (1 diff)
• config.sample/eddie.cf (modified) (1 diff)
• doc/manual.html (modified) (1 diff)
• lib/common/config.py (modified) (4 diffs)

eddie/trunk/bin/eddie.py

@@ -453 +453 @@
             # check if any config/rules files have been modified
             # if so, re-read config
-            if Config.checkfiles():
+            if config.rescan_configs and Config.checkfiles():
                 log.log( '<eddie>main(): config files modified - signalling scheduler to die', 7 )
                 stop_threads()

eddie/trunk/config.sample/eddie.cf

@@ -146 +146 @@
 
 
+# RESCANCONFIGS
+#  Normally Eddie will constantly check its config files for changes, and
+#  re-load them after stopping the threads.  This flag can turn off that
+#  behavior.  If it is set to 1, then you can still send Eddie a HUP signal
+#  to have it reload the configs.
+
+#RESCANCONFIGS=0
+
+
+
 # CLASS
 #  Define classes of hosts which share the same Eddie config.  The name of the

eddie/trunk/doc/manual.html

@@ -193 +193 @@
     <li> <b><a name="WORKDIR">WORKDIR</a></b>
          - directory where Eddie can store temporary files.  [Eddie 0.35+]
+    <li> <b><a name="RESCANCONFIGS">RESCANCONFIGS</a></b>
+         - Flag indicating the desire to constantly scan (and reload) config file changes. Defaults to true.
     <li> <b>CLASS</b> - a grouping of hosts which share the same directives.
     <li> <b>ALIAS</b> - global aliases can be set here, if required.

eddie/trunk/lib/common/config.py

@@ -73 +73 @@
 ##
 consport=33343
+
+
+##
+## Constantly rescan config files for changes? 0/1
+## Set with RESCANCONFIGS in config.
+##
+rescan_configs = 1
+
 
 ####################################################
@@ -419 +427 @@
         # ok, value is 3rd list element
         global num_threads
-        num_threads = int(list[2])              # set the config option
+        try:
+           num_threads = int(list[2])           # set the config option
+        except TypeError:                               # must be integer
+            raise ParseFailure, "NUMTHREADS is not an integer, '%s'" % (list[2])
+
         log.log( "<config>NUMTHREADS: num_threads set to '%d'." % (num_threads), 8 )
 
@@ -545 +557 @@
         log.log( "<config>WORKDIR: set to '%s'" % (self.workdir), 8 )
 
+
+
+class RESCANCONFIGS(ConfigOption):
+    """Set the boolean indicating desire to constantly check for config file changes and reload."""
+
+    def __init__( self, list, typelist ):
+        apply( ConfigOption.__init__, (self,list, typelist) )
+
+        # if we don't have 3 elements ['RESCANCONFIGS', '=', <val>] then
+        # raise an error
+        if len(list) != 3:
+            raise ParseFailure, "RESCANCONFIGS definition has %d tokens when expecting 3" % len(list)
+
+        # ok, value is 3rd list element
+        global rescan_configs
+        try:
+            rescan_configs = int(list[2])               # set the config option
+        except TypeError:                               # must be integer
+            raise ParseFailure, "RESCANCONFIGS is not an integer, '%s'" % (list[2])
+
+        log.log( "<config>RESCANCONFIGS(): rescan_configs set to '%d'." % (rescan_configs), 8 )
 
 
@@ -610 +643 @@
                 "SMTP_SERVERS"  : SMTP_SERVERS,
                 "WORKDIR"       : WORKDIR,
+                "RESCANCONFIGS" : RESCANCONFIGS,
            }