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

[enh] Replace msignals.display by logging in dyndns.py

Browse source
This commit is contained in:
Jérôme Lebleu 2016-03-01 20:59:19 +01:00
parent 954a707643
commit b265a08391
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/yunohost/dyndns.py
View file

@ -33,6 +33,9 @@ import errno
import subprocess import subprocess
from moulinette.core import MoulinetteError from moulinette.core import MoulinetteError
from moulinette.utils.log import getActionLogger
logger = getActionLogger('yunohost.dyndns')
class IPRouteLine(object): class IPRouteLine(object):
@ -83,7 +86,7 @@ def dyndns_subscribe(subscribe_host="dyndns.yunohost.org", domain=None, key=None
if len(glob.glob('/etc/yunohost/dyndns/*.key')) == 0: if len(glob.glob('/etc/yunohost/dyndns/*.key')) == 0:
os.makedirs('/etc/yunohost/dyndns') os.makedirs('/etc/yunohost/dyndns')
msignals.display(m18n.n('dyndns_key_generating')) logger.info(m18n.n('dyndns_key_generating'))
os.system('cd /etc/yunohost/dyndns && ' \ os.system('cd /etc/yunohost/dyndns && ' \
'dnssec-keygen -a hmac-md5 -b 128 -n USER %s' % domain) 'dnssec-keygen -a hmac-md5 -b 128 -n USER %s' % domain)
@ -104,7 +107,7 @@ def dyndns_subscribe(subscribe_host="dyndns.yunohost.org", domain=None, key=None
raise MoulinetteError(errno.EPERM, raise MoulinetteError(errno.EPERM,
m18n.n('dyndns_registration_failed', error)) m18n.n('dyndns_registration_failed', error))
msignals.display(m18n.n('dyndns_registered'), 'success') logger.success(m18n.n('dyndns_registered'))
dyndns_installcron() dyndns_installcron()
@ -159,7 +162,7 @@ def dyndns_update(dyn_host="dynhost.yunohost.org", domain=None, key=None, ip=Non
"ip route cmd error : {}".format(e)) "ip route cmd error : {}".format(e))
if new_ipv6 is None: if new_ipv6 is None:
msignals.display(m18n.n('no_ipv6_connectivity'), 'warning') logger.warning(m18n.n('no_ipv6_connectivity'))
else: else:
new_ipv6 = ipv6 new_ipv6 = ipv6
@ -217,7 +220,7 @@ def dyndns_update(dyn_host="dynhost.yunohost.org", domain=None, key=None, ip=Non
else: else:
private_key_file = key private_key_file = key
if os.system('/usr/bin/nsupdate -k %s /etc/yunohost/dyndns/zone' % private_key_file) == 0: if os.system('/usr/bin/nsupdate -k %s /etc/yunohost/dyndns/zone' % private_key_file) == 0:
msignals.display(m18n.n('dyndns_ip_updated'), 'success') logger.success(m18n.n('dyndns_ip_updated'))
with open('/etc/yunohost/dyndns/old_ip', 'w') as f: with open('/etc/yunohost/dyndns/old_ip', 'w') as f:
f.write(new_ip) f.write(new_ip)
if new_ipv6 is not None: if new_ipv6 is not None:
@ -239,7 +242,7 @@ def dyndns_installcron():
with open('/etc/cron.d/yunohost-dyndns', 'w+') as f: with open('/etc/cron.d/yunohost-dyndns', 'w+') as f:
f.write('*/2 * * * * root yunohost dyndns update >> /dev/null\n') f.write('*/2 * * * * root yunohost dyndns update >> /dev/null\n')
msignals.display(m18n.n('dyndns_cron_installed'), 'success') logger.success(m18n.n('dyndns_cron_installed'))
def dyndns_removecron(): def dyndns_removecron():
@ -253,4 +256,4 @@ def dyndns_removecron():
except: except:
raise MoulinetteError(errno.EIO, m18n.n('dyndns_cron_remove_failed')) raise MoulinetteError(errno.EIO, m18n.n('dyndns_cron_remove_failed'))
msignals.display(m18n.n('dyndns_cron_removed'), 'success') logger.success(m18n.n('dyndns_cron_removed'))