Przeglądaj źródła

Add `parse_infos` to options, use it for "parsed file" message

This adds a new parse_infos besides parse_warnings, and uses it for the
'Included extra file "%s" during parsing' info.

Fixes #272
Daniel Hahler 11 lat temu
rodzic
commit
63a56852eb
3 zmienionych plików z 5 dodań i 1 usunięć
  1. 3 1
      supervisor/options.py
  2. 1 0
      supervisor/supervisord.py
  3. 1 0
      supervisor/tests/base.py

+ 3 - 1
supervisor/options.py

@@ -447,6 +447,7 @@ class ServerOptions(Options):
         self.pidhistory = {}
         self.process_group_configs = []
         self.parse_warnings = []
+        self.parse_infos = []
         self.signal_receiver = SignalReceiver()
 
     def version(self, dummy):
@@ -530,6 +531,7 @@ class ServerOptions(Options):
         # Clear parse warnings, since we may be re-reading the
         # config a second time after a reload.
         self.parse_warnings = []
+        self.parse_infos = []
 
         section = self.configroot.supervisord
         if not hasattr(fp, 'read'):
@@ -563,7 +565,7 @@ class ServerOptions(Options):
                 pattern = os.path.join(base, pattern)
                 filenames = glob.glob(pattern)
                 if not filenames:
-                    self.parse_warnings.append(
+                    self.parse_infos.append(
                         'No file matches via include "%s"' % pattern)
                     continue
                 for filename in sorted(filenames):

+ 1 - 0
supervisor/supervisord.py

@@ -69,6 +69,7 @@ class Supervisor:
         if self.options.first:
             rlimit_messages = self.options.set_rlimits()
             info_messages.extend(rlimit_messages)
+        info_messages.extend(self.options.parse_infos)
         warn_messages.extend(self.options.parse_warnings)
 
         # this sets the options.logger object

+ 1 - 0
supervisor/tests/base.py

@@ -65,6 +65,7 @@ class DummyOptions:
         self.openreturn = None
         self.readfd_result = ''
         self.parse_warnings = []
+        self.parse_infos = []
         self.serverurl = 'http://localhost:9001'
         self.changed_directory = False
         self.chdir_error = None