From 09b922de4ab5dd832b9300f87cfc3f52defff171 Mon Sep 17 00:00:00 2001 From: tkorays Date: Wed, 30 Nov 2022 19:41:31 +0800 Subject: [PATCH] refactor logkit --- Coffee/{Core => Logkit}/LogWatchDog.py | 4 ++-- Coffee/Logkit/__init__.py | 0 Coffee/{Core => Logkit/utils}/LogTail.py | 0 Coffee/Logkit/utils/__init__.py | 0 pyproject.toml | 2 +- setup.py | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename Coffee/{Core => Logkit}/LogWatchDog.py (96%) create mode 100644 Coffee/Logkit/__init__.py rename Coffee/{Core => Logkit/utils}/LogTail.py (100%) create mode 100644 Coffee/Logkit/utils/__init__.py diff --git a/Coffee/Core/LogWatchDog.py b/Coffee/Logkit/LogWatchDog.py similarity index 96% rename from Coffee/Core/LogWatchDog.py rename to Coffee/Logkit/LogWatchDog.py index 4fa1b6a..94d088e 100644 --- a/Coffee/Core/LogWatchDog.py +++ b/Coffee/Logkit/LogWatchDog.py @@ -1,6 +1,6 @@ from watchdog.observers.polling import PollingObserver from watchdog.events import FileSystemEventHandler -from Coffee.Core.LogTail import LogTail +from Coffee.Logkit.utils.LogTail import LogTail from Coffee.Core.Utils import merge_datetime from Coffee.Data import ( PatternGroupBuilder, PatternGroup, RegexPattern @@ -142,7 +142,7 @@ def finish(self, datapoint: DataPoint) -> DataPoint: return datapoint - LogWatchDog('./', r'.*\.log', only_new=True).set_ts_patterns(DEFAULT_TS_PATTERNS).add_pattern( + LogWatchDog('../Core/', r'.*\.log', only_new=True).set_ts_patterns(DEFAULT_TS_PATTERNS).add_pattern( RegexPattern(name="a_pattern", pattern=r'(\d+),(\d+)', fields={ diff --git a/Coffee/Logkit/__init__.py b/Coffee/Logkit/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Coffee/Core/LogTail.py b/Coffee/Logkit/utils/LogTail.py similarity index 100% rename from Coffee/Core/LogTail.py rename to Coffee/Logkit/utils/LogTail.py diff --git a/Coffee/Logkit/utils/__init__.py b/Coffee/Logkit/utils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pyproject.toml b/pyproject.toml index ff01e27..c5ebf3f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "pycoffee" -version = "1.0.5" +version = "1.0.6" authors = [ { name="tkorays", email="tkorays@hotmail.com" }, ] diff --git a/setup.py b/setup.py index 0b10f1e..381c508 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ from setuptools import setup, find_packages -version = '1.0.5' +version = '1.0.6' setup(