From 74454c341a57aab66151b9ef2488eb72a306c002 Mon Sep 17 00:00:00 2001 From: zsdc Date: Mon, 6 Jun 2022 21:33:17 +0300 Subject: event-handler: T3083: Optimized event-handler * Removed dynamic generating for systemd unit * Optimized configuration file deleting process * Added exceptions handlers to event-handler script to protect service from most obvious potential troubles * Improved logging * Moved pattern compilation outside a messages loop to avoid extra operations * Added signal handlers for proper systemd integration --- src/helpers/vyos-event-handler.py | 55 --------------------------------------- 1 file changed, 55 deletions(-) delete mode 100755 src/helpers/vyos-event-handler.py (limited to 'src/helpers') diff --git a/src/helpers/vyos-event-handler.py b/src/helpers/vyos-event-handler.py deleted file mode 100755 index 018a752f4..000000000 --- a/src/helpers/vyos-event-handler.py +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env python3 -# -# Copyright (C) 2022 VyOS maintainers and contributors -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 or later as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -import argparse -import select -import re -import json - -from sys import argv -from os import getpid -from systemd import journal -from vyos.util import call - - -parser = argparse.ArgumentParser() -parser.add_argument("-c", "--config", action="store", help="Path to even-handler configuration", required=True) - -args = parser.parse_args() -config = args.config -data = journal.Reader() -data.seek_tail() -data.get_previous() -p = select.poll() -p.register(data, data.get_events()) -my_pid = getpid() - -with open(config, 'r') as f: - config = json.load(f) - - -if __name__ == '__main__': - while p.poll(): - if data.process() != journal.APPEND: - continue - for entry in data: - message = entry['MESSAGE'] - for name, event_config in config.items(): - pattern = re.compile(rf'{event_config["pattern"]}') - script = event_config['script'] - if message != "" and entry['_PID'] != my_pid and pattern.match(message): - call(script) - journal.send(f'Pattern found: {event_config["pattern"]}, script executed: {script}') -- cgit v1.2.3