restaure software version and local time

parent 8017b2d9
...@@ -133,6 +133,7 @@ send_poezio_info = true ...@@ -133,6 +133,7 @@ send_poezio_info = true
# if true, information about the Operation System you're using # if true, information about the Operation System you're using
# will be sent when requested by anyone # will be sent when requested by anyone
# Set to false if you don't want people to know these information # Set to false if you don't want people to know these information
# Note that this information will not be sent if send_poezio_info is False
send_os_info = true send_os_info = true
# if true, your current time will be sent if asked # if true, your current time will be sent if asked
......
...@@ -122,19 +122,6 @@ DISTRO_INFO = { ...@@ -122,19 +122,6 @@ DISTRO_INFO = {
'Redhat Linux': '/etc/redhat-release' 'Redhat Linux': '/etc/redhat-release'
} }
def temp_failure_retry(func, *args, **kwargs):
"""
workaround for a temporary and specific failure
"""
while True:
try:
return func(*args, **kwargs)
except (os.error, IOError, select.error) as ex:
if ex.errno == errno.EINTR:
continue
else:
raise
def get_os_info(): def get_os_info():
""" """
Returns a detailed and well formated string containing Returns a detailed and well formated string containing
...@@ -151,7 +138,7 @@ def get_os_info(): ...@@ -151,7 +138,7 @@ def get_os_info():
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
close_fds=True) close_fds=True)
process.wait() process.wait()
output = temp_failure_retry(process.stdout.readline).strip() output = process.stdout.readline().decode('utf-8').strip()
# some distros put n/a in places, so remove those # some distros put n/a in places, so remove those
output = output.replace('n/a', '').replace('N/A', '') output = output.replace('n/a', '').replace('N/A', '')
return output return output
......
...@@ -29,6 +29,7 @@ import sleekxmpp ...@@ -29,6 +29,7 @@ import sleekxmpp
from config import config from config import config
from logger import logger from logger import logger
import common
class Connection(sleekxmpp.ClientXMPP): class Connection(sleekxmpp.ClientXMPP):
""" """
...@@ -48,8 +49,16 @@ class Connection(sleekxmpp.ClientXMPP): ...@@ -48,8 +49,16 @@ class Connection(sleekxmpp.ClientXMPP):
jid = '%s/%s' % (config.get('server', 'anon.louiz.org'), resource) jid = '%s/%s' % (config.get('server', 'anon.louiz.org'), resource)
password = None password = None
sleekxmpp.ClientXMPP.__init__(self, jid, password, ssl=True) sleekxmpp.ClientXMPP.__init__(self, jid, password, ssl=True)
self.registerPlugin('xep_0030') self.register_plugin('xep_0030')
self.registerPlugin('xep_0045') self.register_plugin('xep_0045')
if config.get('send_poezio_info', 'true') == 'true':
info = {'name':'poezio',
'version':'0.7-dev'}
if config.get('send_os_info', 'true') == 'true':
info['os'] = common.get_os_info()
self.register_plugin('xep_0092', pconfig=info)
if config.get('send_time', 'true') == 'true':
self.register_plugin('xep_0202')
def start(self): def start(self):
# TODO, try multiple servers # TODO, try multiple servers
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment