Browse Source

If a slice file has been configured, assume the version is correct.

Natenom/support-murmur-13-1446181288462
Michael Ziegler 15 years ago
parent
commit
a56df76721
  1. 3
      pyweb/mumble/MumbleCtlIce.py
  2. 12
      pyweb/settings.py

3
pyweb/mumble/MumbleCtlIce.py

@ -73,7 +73,8 @@ def MumbleCtlIce( connstring ):
murmurversion = meta.getVersion()[:3] murmurversion = meta.getVersion()[:3]
if murmurversion != version:
# If a slice file has been configured, we assume the version is correct.
if settings.SLICE is None and murmurversion != version:
raise EnvironmentError( raise EnvironmentError(
"Murmur is version %d.%d.%d, but I am configured for %d.%d.%d. Please update your settings." % "Murmur is version %d.%d.%d, but I am configured for %d.%d.%d. Please update your settings." %
tuple( murmurversion + version ) tuple( murmurversion + version )

12
pyweb/settings.py

@ -52,18 +52,18 @@ if not MUMBLE_DJANGO_ROOT or not exists( MUMBLE_DJANGO_ROOT ):
MUMBLE_DJANGO_ROOT = dirname(dirname(abspath(__file__))); MUMBLE_DJANGO_ROOT = dirname(dirname(abspath(__file__)));
# The ICE interface version to use.
# The ICE interface version to use. This variable is only used if SLICE is set to None.
#SLICE_VERSION = (1, 1, 8) #SLICE_VERSION = (1, 1, 8)
SLICE_VERSION = (1, 2, 2) SLICE_VERSION = (1, 2, 2)
# Murmur 1.2.0 is incompatible with 1.1.8, that's why this needs to be configured here. # Murmur 1.2.0 is incompatible with 1.1.8, that's why this needs to be configured here.
# If you have <=1.1.8 and 1.2.0 servers running simultaneously, consider using DBus for
# the <=1.1.8 servers and ICE for 1.2.0. That way, you will be able to manage both server
# If you have <=1.1.8 and 1.2.x servers running simultaneously, consider using DBus for
# the <=1.1.8 servers and ICE for 1.2.x. That way, you will be able to manage both server
# versions with the same install of Mumble-Django, without losing any functionality. # versions with the same install of Mumble-Django, without losing any functionality.
# The slice to use for communication over ZeroC ICE. # The slice to use for communication over ZeroC ICE.
# This can be set to the path to the Murmur.ice file that resides
# in your Murmur directory.
# Default: None -- use the slices shipped with MD.
# This can be set to the path to the Murmur.ice file that resides in your Murmur directory.
# Default: None -- use the slices shipped with MD. If you choose to do this, make sure you
# set the SLICE_VERSION variable above!
SLICE = None SLICE = None

Loading…
Cancel
Save