mirror of
https://github.com/bunkerity/bunkerweb
synced 2026-05-24 01:18:26 +00:00
Remove the idea to store logs inside the database
This commit is contained in:
parent
7beb400b47
commit
65f2bf09b4
3 changed files with 0 additions and 50 deletions
|
|
@ -3,10 +3,7 @@ from copy import deepcopy
|
|||
from datetime import datetime
|
||||
from hashlib import sha256
|
||||
from logging import (
|
||||
NOTSET,
|
||||
Logger,
|
||||
_levelToName,
|
||||
_nameToLevel,
|
||||
)
|
||||
import oracledb
|
||||
from os import _exit, getenv, listdir, makedirs
|
||||
|
|
@ -30,7 +27,6 @@ from traceback import format_exc
|
|||
from model import (
|
||||
Base,
|
||||
Instances,
|
||||
Logs,
|
||||
Plugins,
|
||||
Settings,
|
||||
Global_values,
|
||||
|
|
@ -1321,32 +1317,6 @@ class Database:
|
|||
.first()
|
||||
)
|
||||
|
||||
def save_log(
|
||||
self,
|
||||
log: str,
|
||||
level: Tuple[str, int],
|
||||
component: str,
|
||||
) -> str:
|
||||
"""Save log."""
|
||||
with self.__db_session() as session:
|
||||
session.add(
|
||||
Logs(
|
||||
id=int(datetime.now().timestamp()),
|
||||
message=log,
|
||||
level=str(_levelToName[_nameToLevel.get(level, NOTSET)])
|
||||
if isinstance(level, str)
|
||||
else _levelToName.get(level, "NOTSET"),
|
||||
component=component,
|
||||
)
|
||||
)
|
||||
|
||||
try:
|
||||
session.commit()
|
||||
except BaseException:
|
||||
return format_exc()
|
||||
|
||||
return ""
|
||||
|
||||
def add_instance(self, hostname: str, port: int, server_name: str) -> str:
|
||||
"""Add instance."""
|
||||
with self.__db_session() as session:
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ from sqlalchemy import (
|
|||
PrimaryKeyConstraint,
|
||||
SmallInteger,
|
||||
String,
|
||||
TIMESTAMP,
|
||||
)
|
||||
from sqlalchemy.orm import declarative_base, relationship
|
||||
from sqlalchemy.schema import UniqueConstraint
|
||||
|
|
@ -263,15 +262,6 @@ class Selects(Base):
|
|||
setting = relationship("Settings", back_populates="selects")
|
||||
|
||||
|
||||
class Logs(Base):
|
||||
__tablename__ = "logs"
|
||||
|
||||
id = Column(TIMESTAMP, primary_key=True)
|
||||
message = Column(String(2048), nullable=False)
|
||||
level = Column(LOG_LEVELS_ENUM, nullable=False)
|
||||
component = Column(String(256), nullable=False)
|
||||
|
||||
|
||||
class Instances(Base):
|
||||
__tablename__ = "instances"
|
||||
|
||||
|
|
|
|||
|
|
@ -31,17 +31,7 @@ class BWLogger(Logger):
|
|||
extra=None,
|
||||
stack_info=False,
|
||||
stacklevel=1,
|
||||
*,
|
||||
store_db: bool = False,
|
||||
db=None,
|
||||
):
|
||||
if store_db is True and db is not None:
|
||||
with self.db_lock:
|
||||
err = db.save_log(msg, level, self.name)
|
||||
|
||||
if err:
|
||||
self.error(f"Failed to save log to database: {err}")
|
||||
|
||||
return super(BWLogger, self)._log(
|
||||
level, msg, args, exc_info, extra, stack_info, stacklevel
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in a new issue