unify getUptime implementations and correctly handle None. fixes #116

pyweb/mumble/MumbleCtlDbus.py

@@ -330,7 +330,7 @@ class MumbleCtlDbus_118(MumbleCtlBase):
         return self._getDbusServerObject(srvid).sendMessageChannel( dbus.UInt32(channelid), tree, message )
 
     def getUptime( self, srvid):
-        return 0
+        return None
 
     @staticmethod
     def convertDbusTypeToNative(data):

pyweb/mumble/MumbleCtlIce.py

@@ -635,7 +635,7 @@ class MumbleCtlIce_120(MumbleCtlIce_118):
 
     @protectDjangoErrPage
     def getUptime(self, srvid):
-        return 0
+        return None
 
 
 class MumbleCtlIce_122(MumbleCtlIce_120):
@@ -652,7 +652,7 @@ class MumbleCtlIce_122(MumbleCtlIce_120):
 
     @protectDjangoErrPage
     def getUptime(self, srvid):
-        return self._getIceServerObject(srvid).getUptime()
+        return None #self._getIceServerObject(srvid).getUptime()
 
 
 class MumbleCtlIce_123(MumbleCtlIce_120):

pyweb/mumble/models.py

@@ -303,8 +303,13 @@ class Mumble( models.Model ):
                              doc="False if a password is needed to join this server." )
     uptime       = property( lambda self: self.ctl.getUptime(self.srvid),
                              doc="Number of seconds this instance has been running." )
-    upsince      = property( lambda self: datetime.datetime.fromtimestamp( float( time() - self.uptime ) ),
-                             doc="Datetime since when the server is running." )
+
+    @property
+    def upsince(self):
+        """Datetime since when the server is running."""
+        if self.uptime is not None:
+            return datetime.datetime.fromtimestamp( float( time() - self.uptime ) )
+        return None
 
     is_server  = True
     is_channel = False