remove testing stuff and implement getUptime for 1.2.3

14 years ago · 1f86f53c8a
1 changed files with 5 additions and 1 deletions
--- 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()
+