YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use service_status to check if dovecot is running

Browse source
This commit is contained in:
Alexandre Aubin 2016-12-11 17:59:39 -05:00
parent d85657a5c6
commit 0e2cae4f1b
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/yunohost/user.py
View file

@ -35,6 +35,7 @@ import re
from moulinette.core import MoulinetteError from moulinette.core import MoulinetteError
from moulinette.utils.log import getActionLogger from moulinette.utils.log import getActionLogger
from yunohost.service import service_status
logger = getActionLogger('yunohost.user') logger = getActionLogger('yunohost.user')
@ -407,9 +408,10 @@ def user_info(auth, username):
is_limited = not re.match('0[bkMGT]?', userquota) is_limited = not re.match('0[bkMGT]?', userquota)
storage_use = '?' storage_use = '?'
cmd = 'doveadm -f flow quota get -u %s' % user['uid'][0] if (service_status("dovecot")["status"] != "running"):
logger.warning(m18n.n('mailbox_used_space_dovecot_down'))
try: else:
cmd = 'doveadm -f flow quota get -u %s' % user['uid'][0]
cmd_result = subprocess.check_output(cmd, stderr=subprocess.STDOUT, cmd_result = subprocess.check_output(cmd, stderr=subprocess.STDOUT,
shell=True) shell=True)
# Exemple of return value for cmd: # Exemple of return value for cmd:
@ -428,9 +430,6 @@ def user_info(auth, username):
percentage = int(has_percent.group(1)) percentage = int(has_percent.group(1))
storage_use += ' (%s%%)' % percentage storage_use += ' (%s%%)' % percentage
except subprocess.CalledProcessError:
logger.warning(m18n.n('mailbox_used_space_dovecot_down'))
result_dict['mailbox-quota'] = { result_dict['mailbox-quota'] = {
'limit' : userquota if is_limited else m18n.n('unlimit'), 'limit' : userquota if is_limited else m18n.n('unlimit'),
'use' : storage_use 'use' : storage_use