working development environment

README.md

@@ -82,14 +82,16 @@ to your *supervisord.conf*:
 ```ini
 [eventlistener:multivisor-rpc]
 command=multivisor-rpc --bind 0:9002
-events=PROCESS_STATE,SUPERVISOR_STATE
+events=PROCESS_STATE,SUPERVISOR_STATE_CHANGE
 ```
 
 If no *bind* is given, it defaults to `*:9002`.
 
 You are free to choose the event listener name. As a convention we propose
 `multivisor-rpc`.
 
+NB: Make sure that `multivisor-rpc` command is accessible or provide full PATH.
+
 Repeat the above procedure for every supervisor you have running.
 
 

multivisor/multivisor.py

@@ -4,6 +4,7 @@
 import os
 import time
 import weakref
+import requests
 
 from blinker import signal
 
@@ -244,6 +245,7 @@ def __init__(self, supervisor, *args, **kwargs):
         self["supervisor"] = supervisor_name
         self["host"] = supervisor["host"]
         self["uid"] = uid
+        self["gui_url"] = self.get_gui_url()
 
     @property
     def server(self):
@@ -253,6 +255,14 @@ def server(self):
     def full_name(self):
         return self["full_name"]
 
+    def get_gui_url(self):
+        try:
+            response = requests.post('http://circus.lab/services/supervisor',
+                json={'host': self["host"], 'process': self["name"]})
+            return response.json()
+        except: # JSON error (no process) or can't communicate with server
+            return ''
+
     def handle_event(self, event):
         event_name = event["eventname"]
         if event_name.startswith("PROCESS_STATE"):

multivisor/server/rpc.py

@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import sys
 import logging
 import xmlrpc.client

multivisor/server/util.py

@@ -27,11 +27,11 @@ def constant_time_compare(val1, val2):
 
     Taken from Django Source Code
     """
-    val1 = hashlib.sha1(val1).hexdigest()
+    val1 = hashlib.sha1(_safe_encode(val1)).hexdigest()
     if val2.startswith("{SHA}"):  # password can be specified as SHA-1 hash in config
         val2 = val2.split("{SHA}")[1]
     else:
-        val2 = hashlib.sha1(val2).hexdigest()
+        val2 = hashlib.sha1(_safe_encode(val2)).hexdigest()
     if len(val1) != len(val2):
         return False
     result = 0
@@ -40,6 +40,15 @@ def constant_time_compare(val1, val2):
     return result == 0
 
 
+def _safe_encode(data):
+    """Safely encode @data string to utf-8"""
+    try:
+        result = data.encode("utf-8")
+    except (UnicodeDecodeError, UnicodeEncodeError, AttributeError):
+        result = data
+    return result
+
+
 def login_required(app):
     """
     Decorator to mark view as requiring being logged in