nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-15 23:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Ice init to service object for mumble

Browse Source
This commit is contained in:
Andrew Williams
2010-09-02 22:27:05 +01:00
parent 1615f79b88
commit 3e34070a5a
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sso/services/mumble/MumbleCtlIce.py
View File

@@ -179,11 +179,6 @@ class MumbleCtlIce_118(MumbleCtlBase):
self.proxy = connstring; self.proxy = connstring;
self.meta = meta; self.meta = meta;
@protectDjangoErrPage
def getMurmurObj(self, objname):
if hasattr(Murmur, objname):
return getattr(Murmur, objname)
@protectDjangoErrPage @protectDjangoErrPage
def _getIceServerObject(self, srvid): def _getIceServerObject(self, srvid):
return self.meta.getServer(srvid); return self.meta.getServer(srvid);

7
sso/services/mumble/__init__.py
View File

@@ -11,6 +11,10 @@ class MumbleService(BaseService):
'connection_string': 'Meta:tcp -h 127.0.0.1 -p 6502', 'connection_string': 'Meta:tcp -h 127.0.0.1 -p 6502',
'ice_file': 'Murmur.ice' } 'ice_file': 'Murmur.ice' }
def __init__(self):
Ice.loadSlice(self.settings['ice_file'])
import Murmur
@property @property
def mumblectl(self): def mumblectl(self):
if not hasattr(self, '_mumblectl'): if not hasattr(self, '_mumblectl'):
@@ -87,7 +91,6 @@ class MumbleService(BaseService):
def _create_groups(self, groups): def _create_groups(self, groups):
""" Processes a list of groups and makes sure that related mumble groups exist """ """ Processes a list of groups and makes sure that related mumble groups exist """
import Murmur
acls = self.mumblectl.getACL(self.settings['mumble_server_id'], 0) acls = self.mumblectl.getACL(self.settings['mumble_server_id'], 0)
glist = [] glist = []
@@ -97,7 +100,7 @@ class MumbleService(BaseService):
newgroups = False newgroups = False
for agroup in groups: for agroup in groups:
if not agroup.name.replace(' ', '').lower() in glist: if not agroup.name.replace(' ', '').lower() in glist:
group = self.mumblectl.getMurmurObj('Group') group = Murmur.Group()
group.name = group.name.replace(' ', '').lower() group.name = group.name.replace(' ', '').lower()
group.inheritable = True group.inheritable = True
group.inherit = True group.inherit = True