Pārlūkot izejas kodu

- Fixed a bug introduced in 3.0a7 where supervisorctl wouldn't ask
for a username/password combination properly from a
password-protected supervisord if it wasn't filled in within the
"[supervisorctl]" section username/password values. It now
properly asks for a username and password.

Chris McDonough 15 gadi atpakaļ
vecāks
revīzija
a880d1656c
2 mainītis faili ar 8 papildinājumiem un 2 dzēšanām
  1. 6 0
      CHANGES.txt
  2. 2 2
      src/supervisor/supervisorctl.py

+ 6 - 0
CHANGES.txt

@@ -1,5 +1,11 @@
 Next Release
 
+  - Fixed a bug introduced in 3.0a7 where supervisorctl wouldn't ask
+    for a username/password combination properly from a
+    password-protected supervisord if it wasn't filled in within the
+    "[supervisorctl]" section username/password values.  It now
+    properly asks for a username and password.
+
   - Fixed a bug introduced in 3.0a7 where setup.py would not detect the
     Python version correctly.  Patch by Daniele Paolella.
 

+ 2 - 2
src/supervisor/supervisorctl.py

@@ -117,7 +117,6 @@ class Controller(cmd.Cmd):
                       'restart','start','stop','version','clear',
                       'fg','open','quit','remove','shutdown','status',
                       'tail','help']
-        self.info=self.get_supervisor().getAllProcessInfo()
         cmd.Cmd.__init__(self, completekey, stdin, stdout)
         for name, factory, kwargs in self.options.plugin_factories:
             plugin = factory(self, **kwargs)
@@ -235,7 +234,8 @@ class Controller(cmd.Cmd):
         groups=[]
         programs=[]
         groupwiseprograms={}
-        for i in self.info:
+        info = self.get_supervisor().getAllProcessInfo()
+        for i in info:
             programs.append(i['name'])
             if i['group'] not in groups:
                 groups.append(i['group'])