Ver código fonte

Show error messages when clearing a log on the web interface

Mike Naberezny 9 anos atrás
pai
commit
4306528b16
1 arquivos alterados com 10 adições e 2 exclusões
  1. 10 2
      supervisor/web.py

+ 10 - 2
supervisor/web.py

@@ -416,8 +416,16 @@ class StatusView(MeldView):
                     return restartprocess
 
                 elif action == 'clearlog':
-                    callback = rpcinterface.supervisor.clearProcessLogs(
-                        namespec)
+                    try:
+                        callback = rpcinterface.supervisor.clearProcessLogs(
+                            namespec)
+                    except RPCError as e:
+                        def clearerr():
+                            return 'unexpected rpc fault [%d] %s' % (
+                                e.code, e.text)
+                        clearerr.delay = 0.05
+                        return clearerr
+
                     def clearlog():
                         return 'Log for %s cleared' % namespec
                     clearlog.delay = 0.05