Add 'stats' daemon uptime support

This commit is contained in:
Stein Magnus Jodal 2009-12-26 15:57:53 +01:00
parent 0fcdd3cddb
commit 31828883be
3 changed files with 9 additions and 1 deletions

View File

@ -373,7 +373,7 @@ class MpdHandler(object):
'artists': 0, 'artists': 0,
'albums': 0, 'albums': 0,
'songs': 0, 'songs': 0,
'uptime': 0, 'uptime': self.session.stats_uptime(),
'db_playtime': 0, 'db_playtime': 0,
'db_update': 0, 'db_update': 0,
'playtime': 0, 'playtime': 0,

View File

@ -2,6 +2,7 @@ import asyncore
import logging import logging
import socket import socket
import sys import sys
import time
from mopidy import settings from mopidy import settings
from mopidy.session import MpdSession from mopidy.session import MpdSession
@ -17,6 +18,7 @@ class MpdServer(asyncore.dispatcher):
self.set_reuse_addr() self.set_reuse_addr()
self.bind((settings.MPD_SERVER_HOSTNAME, settings.MPD_SERVER_PORT)) self.bind((settings.MPD_SERVER_HOSTNAME, settings.MPD_SERVER_PORT))
self.listen(1) self.listen(1)
self.started_at = int(time.time())
logger.info(u'Please connect to %s port %s using an MPD client.', logger.info(u'Please connect to %s port %s using an MPD client.',
settings.MPD_SERVER_HOSTNAME, settings.MPD_SERVER_PORT) settings.MPD_SERVER_HOSTNAME, settings.MPD_SERVER_PORT)
@ -34,3 +36,6 @@ class MpdServer(asyncore.dispatcher):
self.handle_close() self.handle_close()
sys.exit(0) sys.exit(0)
@property
def uptime(self):
return int(time.time()) - self.started_at

View File

@ -61,3 +61,6 @@ class MpdSession(asynchat.async_chat):
output = u'%s%s' % (output, settings.MPD_LINE_TERMINATOR) output = u'%s%s' % (output, settings.MPD_LINE_TERMINATOR)
data = output.encode(settings.MPD_LINE_ENCODING) data = output.encode(settings.MPD_LINE_ENCODING)
self.push(data) self.push(data)
def stats_uptime(self):
return self.server.uptime