Upload

Author: FusionSolutions

fsLogger/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.1"
+__version__ = "0.2.2"
 __doc__ = """
 Logging utility v{}
 Copyright (C) 2021 Fusion Solutions KFT <contact@fusionsolutions.io>

fsLogger/abcs.py

@@ -1,7 +1,6 @@
 # Builtin modules
 from __future__ import annotations
 from abc import ABCMeta, abstractmethod
-from threading import RLock
 # from socket import socket
 from typing import Dict, Tuple, Optional, Any, List, Union, OrderedDict
 # Third party modules
@@ -46,7 +45,6 @@ def dump(self) -> List[Any]: ...
 	def extend(self, inp:T_Filter) -> None: ...
 
 class T_LoggerManager(metaclass=ABCMeta):
-	lock:RLock
 	filterChangeTime:float
 	groupSeperator:str
 	handler:Optional[T_LoggerManager]

fsLogger/globalLocker.py

@@ -0,0 +1,6 @@
+# Builtin modules
+from threading import RLock
+# Third party modules
+# Local modules
+# Program
+lock = RLock()

fsLogger/loggerManager.py

@@ -3,7 +3,6 @@
 import sys, atexit, traceback
 from datetime import datetime
 from time import monotonic
-from threading import RLock
 from typing import Dict, List, Any, cast, TextIO, Union, Tuple, Optional
 # Third party modules
 # Local modules
@@ -18,7 +17,6 @@
 DEF_DATE = "%Y-%m-%d %H:%M:%S.%f"
 
 class LoggerManager(T_LoggerManager):
-	lock = RLock()
 	filterChangeTime = monotonic()
 	groupSeperator = "."
 	@staticmethod
@@ -52,10 +50,9 @@ def getFilterData(self, name:str) -> Tuple[float, int]:
 		)
 	def emit(self, name:str, levelID:int, timestamp:float, message:Any, _args:Tuple[Any, ...], _kwargs:Dict[str, Any]) -> None:
 		parsedMessage = self.messageFormatter(name, levelID, timestamp, message, _args, _kwargs)
-		with self.lock:
-			for handler in self.modules:
-				try: handler.emit(parsedMessage)
-				except: pass
+		for handler in self.modules:
+			try: handler.emit(parsedMessage)
+			except: pass
 	def extendFilter(self, data:Union[List[Any], str, T_Filter]) -> None:
 		filter:T_Filter = Filter(0)
 		if isinstance(data, list):

fsLogger/modules.py

@@ -1,14 +1,14 @@
 # Builtin modules
 from __future__ import annotations
 import re, os, traceback
-from threading import Lock
 from glob import glob
 from datetime import datetime, timezone
 from typing import List, Tuple, Any, Optional
 # Third party modules
 # Local modules
 from .abcs import T_Logger, T_ModuleBase
 from .logger import Logger
+from .globalLocker import lock
 # Program
 class STDErrModule:
 	log:T_Logger
@@ -73,11 +73,9 @@ def close(self) -> None:
 class FileStream(T_ModuleBase):
 	fullPath:str
 	stream:Any
-	lock:Lock
 	isClosed:bool
 	def __init__(self, fullPath:str):
 		self.fullPath = fullPath
-		self.lock     = Lock()
 		self.stream   = None
 		self.isClosed = False
 	def open(self) -> None:
@@ -96,7 +94,7 @@ def write(self, data:str) -> None:
 			traceback.print_exc()
 			self.isClosed = True
 	def emit(self, message:str) -> None:
-		with self.lock:
+		with lock:
 			self.write(message)
 	def close(self) -> None:
 		if self.stream is not None:
@@ -120,7 +118,7 @@ def __init__(self, fullPath:str, maxBytes:int=0, rotateDaily:bool=False, maxBack
 		self.timezone     = timezone.utc if useUTCTimezone else None
 		super().__init__(fullPath)
 	def emit(self, message:str) -> None:
-		with self.lock:
+		with lock:
 			if self.shouldRotate(message):
 				self.doRotate()
 			self.write(message)
@@ -150,6 +148,7 @@ def doRotate(self) -> None:
 			traceback.print_exc()
 			self.stream = None
 			self.isClosed = True
+		self.lastFileSize = 0
 		self.open()
 	def shiftLogFiles(self) -> None:
 		def sortFileNums(e:str) -> Tuple[int, str]:
@@ -191,7 +190,7 @@ def buildPath(self) -> str:
 			)
 		)
 	def emit(self, message:str) -> None:
-		with self.lock:
+		with lock:
 			if self.shouldRotate(message):
 				self.doRotate()
 			self.write(message)

setup.py

@@ -9,7 +9,7 @@
 
 setup(
 	name                          = "python-fslogger",
-	version                       = "0.2.1",
+	version                       = "0.2.2",
 	description                   = "Logging utility",
 	keywords                      = "logging utility fusion solutions fusionsolutions",
 	author                        = "Andor `iFA` Rajci - Fusions Solutions KFT",