X-Git-Url: https://git.llucax.com/software/pymin.git/blobdiff_plain/60de22ab6dba022c4a6ed243c15f1e941f8154cd..24e0b139acf9ed84e1b9331f7629c77c6adf1cf8:/pymin/services/ppp/__init__.py?ds=sidebyside diff --git a/pymin/services/ppp/__init__.py b/pymin/services/ppp/__init__.py index 868b6d5..1dce315 100644 --- a/pymin/services/ppp/__init__.py +++ b/pymin/services/ppp/__init__.py @@ -1,11 +1,15 @@ # vim: set encoding=utf-8 et sw=4 sts=4 : +import os +import subprocess from os import path +from signal import SIGTERM +import logging ; log = logging.getLogger('pymin.services.ppp') from pymin.seqtools import Sequence from pymin.dispatcher import Handler, handler, HandlerError -from pymin.services.util import Restorable, ConfigWriter \ - ,TransactionalHandler, DictSubHandler, call +from pymin.services.util import Restorable, ConfigWriter, ReloadHandler, \ + TransactionalHandler, DictSubHandler, call __ALL__ = ('PppHandler',) @@ -32,6 +36,7 @@ class Connection(Sequence): self.username = username self.password = password self.type = type + self._running = False if type == 'OE': if not 'device' in kw: raise ConnectionError('Bad arguments for type=OE') @@ -70,11 +75,11 @@ class ConnectionHandler(DictSubHandler): _cont_subhandler_attr = 'conns' _cont_subhandler_class = Connection -class PppHandler(Restorable, ConfigWriter, TransactionalHandler): +class PppHandler(Restorable, ConfigWriter, ReloadHandler, TransactionalHandler): handler_help = u"Manage ppp service" - _persistent_attrs = ('conns') + _persistent_attrs = ['conns'] _restorable_defaults = dict( conns = dict(), @@ -85,38 +90,117 @@ class PppHandler(Restorable, ConfigWriter, TransactionalHandler): def __init__(self, pickle_dir='.', config_dir='.'): r"Initialize Ppphandler object, see class documentation for details." + log.debug(u'PppHandler(%r, %r)', pickle_dir, config_dir) self._persistent_dir = pickle_dir self._config_writer_cfg_dir = config_dir self._config_build_templates() self._restore() + log.debug(u'PppHandler(): restoring connections...') + for conn in self.conns.values(): + if conn._running: + log.debug(u'PppHandler(): starting connection %r', conn.name) + conn._running = False + self.start(conn.name) self.conn = ConnectionHandler(self) - @handler('Starts the service') - def start(self, name): - if name in self.conns: - call(['pppd','call', name],stdout=None, stderr=None) - #print ('pon', name) - else: - raise ConnectionNotFoundError(name) - - @handler('Stops the service') - def stop(self, name): + @handler(u'Start one or all the connections.') + def start(self, name=None): + log.debug(u'PppHandler.start(%r)', name) + names = [name] + if name is None: + names = self.conns.keys() + for name in names: + if name in self.conns: + if not self.conns[name]._running: + log.debug(u'PppHandler.start: starting connection %r', name) + call(('pppd', 'call', name)) + self.conns[name]._running = True + self._dump_attr('conns') + else: + log.debug(u'PppHandler.start: connection not found') + raise ConnectionNotFoundError(name) + + @handler(u'Stop one or all the connections.') + def stop(self, name=None): + log.debug(u'PppHandler.stop(%r)', name) + names = [name] + names = [name] + if name is None: + names = self.conns.keys() + for name in names: + if name in self.conns: + if self.conns[name]._running: + pid_file = '/var/run/ppp-' + name + '.pid' + log.debug(u'PppHandler.stop: getting pid from %r', pid_file) + if path.exists(pid_file): + pid = file(pid_file).readline() + pid = int(pid.strip()) + try: + log.debug(u'PppHandler.stop: killing pid %r', pid) + os.kill(pid, SIGTERM) + except OSError, e: + log.debug(u'PppHandler.stop: error killing: %r', e) + else: + log.debug(u'PppHandler.stop: pid file not found') + self.conns[name]._running = False + self._dump_attr('conns') + else: + log.debug(u'PppHandler.stop: connection not running') + else: + log.debug(u'PppHandler.stop: connection not found') + raise ConnectionNotFoundError(name) + + @handler(u'Restart one or all the connections (even disconnected ones).') + def restart(self, name=None): + log.debug(u'PppHandler.restart(%r)', name) + names = [name] + if name is None: + names = self.conns.keys() + for name in names: + self.stop(name) + self.start(name) + + @handler(u'Restart only one or all the already running connections.') + def reload(self, name=None): + r"reload() -> None :: Reload the configuration of the service." + log.debug(u'PppHandler.reload(%r)', name) + names = [name] + if name is None: + names = self.conns.keys() + for name in names: + if self.conns[name]._running: + self.stop(name) + self.start(name) + + @handler(u'Tell if the service is running.') + def running(self, name=None): + r"reload() -> None :: Reload the configuration of the service." + log.debug(u'PppHandler.running(%r)', name) + if name is None: + return [c.name for c in self.conns.values() if c._running] if name in self.conns: - if path.exists('/var/run/ppp-' + name + '.pid'): - pid = file('/var/run/ppp-' + name + '.pid').readline().strip() - call(['kill',pid],stdout=None, stderr=None) - #print ('poff', name) + return int(self.conns[name]._running) else: + log.debug(u'PppHandler.running: connection not found') raise ConnectionNotFoundError(name) - @handler('Reloads the service') - def reload(self): - for conn in self.conns.values(): - self.stop(conn.name) - self.start(conn.name) + def handle_timer(self): + log.debug(u'PppHandler.handle_timer()') + for c in self.conns.values(): + log.debug(u'PppHandler.handle_timer: processing connection %r', c) + p = subprocess.Popen(('pgrep', '-f', 'pppd call ' + c.name), + stdout=subprocess.PIPE) + pid = p.communicate()[0] + if p.returncode == 0 and len(pid) > 0: + log.debug(u'PppHandler.handle_timer: pid present, running') + c._running = True + else: + log.debug(u'PppHandler.handle_timer: pid absent, NOT running') + c._running = False def _write_config(self): r"_write_config() -> None :: Generate all the configuration files." + log.debug(u'PppHandler._write_config()') #guardo los pass que van el pap-secrets vars_pap = dict() for conn in self.conns.values(): @@ -139,6 +223,13 @@ class PppHandler(Restorable, ConfigWriter, TransactionalHandler): if __name__ == '__main__': + + logging.basicConfig( + level = logging.DEBUG, + format = '%(asctime)s %(levelname)-8s %(message)s', + datefmt = '%H:%M:%S', + ) + p = PppHandler() p.conn.add('ppp_c','nico','nico',type='PPP',device='tty0') p.conn.add('pppoe_c','fede','fede',type='OE',device='tty1') @@ -146,3 +237,4 @@ if __name__ == '__main__': p.commit() print p.conn.list() print p.conn.show() +