diff options
| -rw-r--r-- | ncserver/base/log.py | 6 | ||||
| -rw-r--r-- | ncserver/module/system.py | 5 | ||||
| -rw-r--r-- | ncserver/server.py | 19 |
3 files changed, 20 insertions, 10 deletions
diff --git a/ncserver/base/log.py b/ncserver/base/log.py index 15fd6ab..411fa10 100644 --- a/ncserver/base/log.py +++ b/ncserver/base/log.py @@ -37,8 +37,9 @@ LOG_OPERATIONAL = logging.getLogger('ncserver.operational') def log_config_change(session, node, info): """Log a configuration change.""" - LOG_CONFIG.notice('%s on session %d is editing %s: %s', - user_for_session(session), session.session_id, node, info + LOG_CONFIG.notice( + '%s on session %d is editing %s: %s', + user_for_session(session), session.session_id, node, info ) @@ -62,7 +63,6 @@ def configure_logging(level: int): root.addHandler(HANDLER) - HOSTNAME_CHANGED.add(configure_format) if not hasattr(logging, 'NOTICE'): diff --git a/ncserver/module/system.py b/ncserver/module/system.py index d5c097c..5f72ab0 100644 --- a/ncserver/module/system.py +++ b/ncserver/module/system.py @@ -134,8 +134,9 @@ class NTPServer: # pylint: disable=R0902 nondef_args = ', '.join( ['{}={}'.format(*item) for item in args.items()] ) - return "NTPServer('{host}', {nondef_args})".format(host=self.host, - nondef_args=nondef_args) + return "NTPServer('{host}', {nondef_args})".format( + host=self.host, nondef_args=nondef_args + ) def __str__(self): """Return the configuration line for this server.""" diff --git a/ncserver/server.py b/ncserver/server.py index 796e85d..188f022 100644 --- a/ncserver/server.py +++ b/ncserver/server.py @@ -32,14 +32,16 @@ QName = etree.QName # pylint: disable=I1101 def log_read(session, rpc): """Log a configuration read.""" - LOG_CONFIG.debug('%s on session %d is requesting configuration: %s', + LOG_CONFIG.debug( + '%s on session %d is requesting configuration: %s', user_for_session(session), session.session_id, etree.tostring(rpc) ) def log_write(session, rpc): """Log a configuration write attempt.""" - LOG_CONFIG.debug('%s on session %d is editing configuration: %s', + LOG_CONFIG.debug( + '%s on session %d is editing configuration: %s', user_for_session(session), session.session_id, etree.tostring(rpc) ) @@ -54,6 +56,8 @@ class AuthenticationController(SSHAuthorizedKeysController): _open_session = getattr(netconf.base.NetconfSession, '_open_session') + + def _open_session_and_log(self, is_server): """Log that authentication has been successful.""" _open_session(self, is_server) @@ -62,9 +66,12 @@ def _open_session_and_log(self, is_server): port = peername[1] if ':' in ipaddr: ipaddr = '[' + ipaddr + ']' - LOG_AUTH.notice('Authentication granted to %s from %s:%d, session %d', + LOG_AUTH.notice( + 'Authentication granted to %s from %s:%d, session %d', user_for_session(self), ipaddr, port, self.session_id ) + + setattr(netconf.base.NetconfSession, '_open_session', _open_session_and_log) @@ -127,8 +134,10 @@ class Server: def _rpc_wrapper(self, session, rpc, *params): """Handle module RPCs.""" name = QName(rpc[0].tag).localname - LOG_OPERATIONAL.info('RPC %s invoked by %s on session %d', - name, user_for_session(session), session.session_id) + LOG_OPERATIONAL.info( + 'RPC %s invoked by %s on session %d', + name, user_for_session(session), session.session_id + ) if self.modman.has_rpc(name): try: result = self.modman.rpc(name)(session, rpc, *params) |