From 1f86f53c8ac77f1492f424579d11b6f517a388a9 Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Wed, 29 Dec 2010 13:10:22 +0100 Subject: [PATCH] remove testing stuff and implement getUptime for 1.2.3 --- pyweb/mumble/MumbleCtlIce.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pyweb/mumble/MumbleCtlIce.py b/pyweb/mumble/MumbleCtlIce.py index 37caa48..30f3bf1 100644 --- a/pyweb/mumble/MumbleCtlIce.py +++ b/pyweb/mumble/MumbleCtlIce.py @@ -663,7 +663,7 @@ class MumbleCtlIce_122(MumbleCtlIce_120): @protectDjangoErrPage def getUptime(self, srvid): - return None #self._getIceServerObject(srvid).getUptime() + return self._getIceServerObject(srvid).getUptime() class MumbleCtlIce_123(MumbleCtlIce_120): @@ -690,4 +690,8 @@ class MumbleCtlIce_123(MumbleCtlIce_120): buf.seek(0) self._getIceServerObject(srvid).setTexture(mumbleid, buf.read()) + @protectDjangoErrPage + def getUptime(self, srvid): + return self._getIceServerObject(srvid).getUptime() +