Compare commits

..

No commits in common. "master" and "7c440b6ed321fed9ec7915c75f084bf7e14898b1" have entirely different histories.

3 changed files with 4 additions and 35 deletions

View File

@ -11,19 +11,7 @@ TimedSwitchingFileHandler
------------------------- -------------------------
This file handler starts a new file at regular intervals, comparable to This file handler starts a new file at regular intervals, comparable to
the TimedRotatingFileHandler. The switch always occurs at a “round” the TimedRotatingFileHandler.
time, i.e. at the hour for hourly switches, at midnight for daily
switches, etc. The old file stays open until just before the first log
entry is written to the new file.
### Parameters
| Parameter | Default | Description |
|-|-|-|
| `filename` | (required) | Path to the log files. The timestamp and `.log` is appended |
| `when` | `'h'` | When log files are switched: (every **s**econd, **m**inute, **h**our, **d**ay, **w**eek) |
| `utc` | `False` | Timestamps are in UTC (otherwise local time) |
| `create_directory` | `False` | Intermediate directories in `filename` are created if necessary |
TimeoutSwitchingFileHandler TimeoutSwitchingFileHandler
--------------------------- ---------------------------
@ -37,12 +25,3 @@ activity alternate with periods of inactivity. Log switchse will
typically occur during inactivity, so each log file will include one typically occur during inactivity, so each log file will include one
complete active period. Also, since the log files are closed, they can complete active period. Also, since the log files are closed, they can
be safely compressed or removed. be safely compressed or removed.
### Parameters
| Parameter | Default | Description |
|-|-|-|
| `filename` | (required) | Path to the log files. The timestamp is appended |
| `min_timeout` | `60` | Logfile is closed if there hasn't been any activity for `min_timeout` seconds |
| `max_timeout` | `3600` | Logfile is closed if is has been created `max_timeout` seconds ago |
| `create_directory` | `False` | Intermediate directories in `filename` are created if necessary |

View File

@ -4,7 +4,7 @@ build-backend = "hatchling.build"
[project] [project]
name = "switchinglogfilehandlers" name = "switchinglogfilehandlers"
version = "0.0.4" version = "0.0.3"
authors = [ authors = [
{ name="Peter J. Holzer", email="hjp@hjp.at" }, { name="Peter J. Holzer", email="hjp@hjp.at" },
] ]

View File

@ -1,16 +1,13 @@
import logging import logging
import os
import os.path
import threading import threading
import time import time
class TimeoutSwitchingFileHandler(logging.Handler): class TimeoutSwitchingFileHandler(logging.Handler):
def __init__(self, filename, min_timeout=60, max_timeout=3600, create_directory=False): def __init__(self, filename, min_timeout=60, max_timeout=3600):
super().__init__() super().__init__()
self.basename = filename self.basename = filename
self.min_timeout = min_timeout self.min_timeout = min_timeout
self.max_timeout = max_timeout self.max_timeout = max_timeout
self.create_directory = create_directory
self.fh = None self.fh = None
self.last_emit = 0 self.last_emit = 0
self.first_emit = 0 self.first_emit = 0
@ -24,9 +21,6 @@ class TimeoutSwitchingFileHandler(logging.Handler):
if not self.fh: if not self.fh:
now_tm = time.localtime(now) now_tm = time.localtime(now)
filename = self.basename + time.strftime("%Y-%m-%d-%H-%M-%S", now_tm) + "-%06d" % (now % 1 * 1000000) + ".log" filename = self.basename + time.strftime("%Y-%m-%d-%H-%M-%S", now_tm) + "-%06d" % (now % 1 * 1000000) + ".log"
if self.create_directory:
dirname = os.path.dirname(filename)
os.makedirs(dirname, exist_ok=True)
self.fh = open(filename, "a") self.fh = open(filename, "a")
self.first_emit = now self.first_emit = now
self.fh.write(msg) self.fh.write(msg)
@ -48,7 +42,7 @@ class TimeoutSwitchingFileHandler(logging.Handler):
self.release() self.release()
class TimedSwitchingFileHandler(logging.Handler): class TimedSwitchingFileHandler(logging.Handler):
def __init__(self, filename, when='h', utc=False, create_directory=False): def __init__(self, filename, when='h', utc=False):
super().__init__() super().__init__()
self.basename = filename self.basename = filename
when = when.lower() when = when.lower()
@ -65,7 +59,6 @@ class TimedSwitchingFileHandler(logging.Handler):
else: else:
raise ValueError(f"Unknown value “{when}” for when") raise ValueError(f"Unknown value “{when}” for when")
self.utc = utc self.utc = utc
self.create_directory = create_directory
self.current_filename = None self.current_filename = None
self.fh = None self.fh = None
@ -80,9 +73,6 @@ class TimedSwitchingFileHandler(logging.Handler):
if new_filename != self.current_filename: if new_filename != self.current_filename:
if self.fh: if self.fh:
self.fh.close() self.fh.close()
if self.create_directory:
new_dirname = os.path.dirname(new_filename)
os.makedirs(new_dirname, exist_ok=True)
self.fh = open(new_filename, "a") self.fh = open(new_filename, "a")
self.current_filename = new_filename self.current_filename = new_filename
self.fh.write(msg) self.fh.write(msg)