Hexor/OutFleet
1
0
Fork 0
mirror of https://github.com/house-of-vanity/OutFleet.git synced 2025-07-07 01:24:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Send logs to sync.log

Browse Source
This commit is contained in:
Alexandr Bogomyakov
2024-03-16 04:29:49 +02:00
parent b942a3c8ee
commit ac2e8ee44b
2 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib.py
View File

@ -56,9 +56,13 @@ class Server:
"keys": self.client.get_keys(), "keys": self.client.get_keys(),
} }
self.log = logging.getLogger(f'OutFleet.server[{self.data["name"]}]') self.log = logging.getLogger(f'OutFleet.server[{self.data["name"]}]')
# self.log.info(f"KEY ON {self.data['name']} {self.data['keys'][0]}") file_handler = logging.FileHandler("sync.log")
# for key in self.data['keys']: file_handler.setLevel(logging.DEBUG)
# print(key) formatter = logging.Formatter(
"%(asctime)s - %(name)s - %(levelname)s - %(message)s"
)
file_handler.setFormatter(formatter)
self.log.addHandler(file_handler)
def info(self) -> ServerDict: def info(self) -> ServerDict:
return self.data return self.data

34
main.py
View File

@ -11,6 +11,22 @@ from flask_cors import CORS
from lib import Server from lib import Server
logging.getLogger("werkzeug").setLevel(logging.ERROR) logging.getLogger("werkzeug").setLevel(logging.ERROR)
logging.basicConfig(
level=logging.INFO,
format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
datefmt="%d-%m-%Y %H:%M:%S",
)
log = logging.getLogger("OutFleet")
file_handler = logging.FileHandler("sync.log")
file_handler.setLevel(logging.DEBUG)
formatter = logging.Formatter(
"%(asctime)s - %(name)s - %(levelname)s - %(message)s"
)
file_handler.setFormatter(formatter)
log.addHandler(file_handler)
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument( parser.add_argument(
"-c", "-c",
@ -21,14 +37,6 @@ parser.add_argument(
args = parser.parse_args() args = parser.parse_args()
CFG_PATH = args.config CFG_PATH = args.config
logging.basicConfig(
level=logging.INFO,
format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
datefmt="%d-%m-%Y %H:%M:%S",
)
log = logging.getLogger("OutFleet")
SERVERS = list() SERVERS = list()
CLIENTS = dict() CLIENTS = dict()
VERSION = '2' VERSION = '2'
@ -382,11 +390,6 @@ def sync():
) )
if request.method == "POST": if request.method == "POST":
log = logging.getLogger("sync") log = logging.getLogger("sync")
if request.form.get("wipe") == 'all':
for server in SERVERS:
log.info("Wiping all keys on [%s]", server.data["name"])
for client in server.data['keys']:
server.delete_key(client.key_id)
file_handler = logging.FileHandler("sync.log") file_handler = logging.FileHandler("sync.log")
file_handler.setLevel(logging.DEBUG) file_handler.setLevel(logging.DEBUG)
formatter = logging.Formatter( formatter = logging.Formatter(
@ -394,6 +397,11 @@ def sync():
) )
file_handler.setFormatter(formatter) file_handler.setFormatter(formatter)
log.addHandler(file_handler) log.addHandler(file_handler)
if request.form.get("wipe") == 'all':
for server in SERVERS:
log.info("Wiping all keys on [%s]", server.data["name"])
for client in server.data['keys']:
server.delete_key(client.key_id)
server_hash = {} server_hash = {}
for server in SERVERS: for server in SERVERS: