Browse Source

ping Murmur to see if it's reachable with the given proxy before connecting; s/ICE/Ice/.

Natenom/support-murmur-13-1446181288462
Michael Ziegler 15 years ago
parent
commit
83f65aba61
  1. 5
      pyweb/mumble/MumbleCtlIce.py
  2. 2
      pyweb/mumble/management/server_detect.py

5
pyweb/mumble/MumbleCtlIce.py

@ -77,6 +77,11 @@ def MumbleCtlIce( connstring, slicefile=None, icesecret=None ):
prx = ice.stringToProxy( connstring.encode("utf-8") ) prx = ice.stringToProxy( connstring.encode("utf-8") )
try:
prx.ice_ping()
except Ice.Exception:
raise EnvironmentError( "Murmur does not appear to be listening on this address (Ice ping failed)." )
try: try:
import Murmur import Murmur
except ImportError: except ImportError:

2
pyweb/mumble/management/server_detect.py

@ -62,7 +62,7 @@ def find_existing_instances( **kwargs ):
print " 2) ICE -- Meta:tcp -h 127.0.0.1 -p 6502" print " 2) ICE -- Meta:tcp -h 127.0.0.1 -p 6502"
print "Enter 1 or 2 for the defaults above, nothing to skip Server detection," print "Enter 1 or 2 for the defaults above, nothing to skip Server detection,"
print "and if the defaults do not fit your needs, enter the correct string." print "and if the defaults do not fit your needs, enter the correct string."
print "Whether to use DBus or ICE will be detected automatically from the"
print "Whether to use DBus or Ice will be detected automatically from the"
print "string's format." print "string's format."
print print

Loading…
Cancel
Save