mirror of
https://gitlab.com/crafty-controller/crafty-4.git
synced 2024-08-30 18:23:09 +00:00
Merge branch 'bugfix/stats-db-select' into 'dev'
Get rid of the stats database proxy See merge request crafty-controller/crafty-4!276
This commit is contained in:
Andrew
commit
b0b9936df7
@ -1,17 +1,18 @@
|
||||
import os
|
||||
import logging
|
||||
import datetime
|
||||
import typing as t
|
||||
|
||||
from playhouse.shortcuts import model_to_dict
|
||||
|
||||
from app.classes.models.servers import Servers, HelperServers
|
||||
from app.classes.shared.helpers import Helpers
|
||||
from app.classes.shared.main_models import DatabaseShortcuts
|
||||
from app.classes.shared.migration import MigrationManager
|
||||
|
||||
try:
|
||||
from peewee import (
|
||||
SqliteDatabase,
|
||||
Model,
|
||||
DatabaseProxy,
|
||||
ForeignKeyField,
|
||||
CharField,
|
||||
AutoField,
|
||||
@ -19,6 +20,7 @@ try:
|
||||
BooleanField,
|
||||
IntegerField,
|
||||
FloatField,
|
||||
DoesNotExist,
|
||||
)
|
||||
|
||||
except ModuleNotFoundError as e:
|
||||
@ -27,7 +29,6 @@ except ModuleNotFoundError as e:
|
||||
logger = logging.getLogger(__name__)
|
||||
peewee_logger = logging.getLogger("peewee")
|
||||
peewee_logger.setLevel(logging.INFO)
|
||||
database_stats_proxy = DatabaseProxy()
|
||||
|
||||
|
||||
# **********************************************************************************
|
||||
@ -59,7 +60,6 @@ class ServerStats(Model):
|
||||
|
||||
class Meta:
|
||||
table_name = "server_stats"
|
||||
database = database_stats_proxy
|
||||
|
||||
|
||||
# **********************************************************************************
|
||||
@ -70,7 +70,7 @@ class HelperServerStats:
|
||||
self.database = database
|
||||
|
||||
@staticmethod
|
||||
def init_database(server_id):
|
||||
def init_database(server_id) -> t.Optional[SqliteDatabase]:
|
||||
try:
|
||||
server = HelperServers.get_server_data_by_id(server_id)
|
||||
db_folder = os.path.join(f"{server['path']}", "db_stats")
|
||||
@ -93,17 +93,17 @@ class HelperServerStats:
|
||||
f"{helper_stats.migration_dir}", "stats"
|
||||
)
|
||||
helper_stats.db_path = db_file
|
||||
database_stats_proxy.initialize(database)
|
||||
migration_manager = MigrationManager(database, helper_stats)
|
||||
migration_manager.up() # Automatically runs migrations
|
||||
database_stats_proxy.initialize(database)
|
||||
return database
|
||||
except Exception as ex:
|
||||
logger.warning(
|
||||
f"Error try to look for the db_stats files for server : {ex}"
|
||||
)
|
||||
return None
|
||||
|
||||
@staticmethod
|
||||
def select_database(server_id):
|
||||
def select_database(server_id) -> t.Optional[SqliteDatabase]:
|
||||
try:
|
||||
server = HelperServers.get_server_data_by_id(server_id)
|
||||
db_file = os.path.join(
|
||||
@ -114,29 +114,25 @@ class HelperServerStats:
|
||||
database = SqliteDatabase(
|
||||
db_file, pragmas={"journal_mode": "wal", "cache_size": -1024 * 10}
|
||||
)
|
||||
database_stats_proxy.initialize(database)
|
||||
return database
|
||||
except Exception as ex:
|
||||
logger.warning(
|
||||
f"Error try to look for the db_stats files for server : {ex}"
|
||||
)
|
||||
return None
|
||||
|
||||
@staticmethod
|
||||
def get_all_servers_stats():
|
||||
servers = HelperServers.get_all_defined_servers()
|
||||
server_data = []
|
||||
try:
|
||||
for s in servers:
|
||||
HelperServerStats.select_database(s.get("server_id"))
|
||||
latest = (
|
||||
ServerStats.select()
|
||||
.where(ServerStats.server_id == s.get("server_id"))
|
||||
.order_by(ServerStats.created.desc())
|
||||
.limit(1)
|
||||
)
|
||||
for server in servers:
|
||||
stats = HelperServerStats.get_server_stats_by_id(server["server_id"])
|
||||
|
||||
server_data.append(
|
||||
{
|
||||
"server_data": s,
|
||||
"stats": DatabaseShortcuts.return_rows(latest)[0],
|
||||
"server_data": server,
|
||||
"stats": stats,
|
||||
"user_command_permission": True,
|
||||
}
|
||||
)
|
||||
@ -149,7 +145,7 @@ class HelperServerStats:
|
||||
@staticmethod
|
||||
def insert_server_stats(server):
|
||||
server_id = server.get("id", 0)
|
||||
HelperServerStats.select_database(server_id)
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
|
||||
if server_id == 0:
|
||||
logger.warning("Stats saving failed with error: Server unknown (id = 0)")
|
||||
@ -165,7 +161,7 @@ class HelperServerStats:
|
||||
ServerStats.mem_percent: server.get("mem_percent", 0),
|
||||
ServerStats.world_name: server.get("world_name", ""),
|
||||
ServerStats.world_size: server.get("world_size", ""),
|
||||
ServerStats.server_port: server.get("server_port", ""),
|
||||
ServerStats.server_port: server.get("server_port", 0),
|
||||
ServerStats.int_ping_results: server.get("int_ping_results", False),
|
||||
ServerStats.online: server.get("online", False),
|
||||
ServerStats.max: server.get("max", False),
|
||||
@ -173,67 +169,73 @@ class HelperServerStats:
|
||||
ServerStats.desc: server.get("desc", False),
|
||||
ServerStats.version: server.get("version", False),
|
||||
}
|
||||
).execute()
|
||||
).execute(database)
|
||||
|
||||
@staticmethod
|
||||
def remove_old_stats(server_id, last_week):
|
||||
HelperServerStats.select_database(server_id)
|
||||
ServerStats.delete().where(ServerStats.created < last_week).execute()
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
ServerStats.delete().where(ServerStats.created < last_week).execute(database)
|
||||
|
||||
@staticmethod
|
||||
def get_latest_server_stats(server_id):
|
||||
HelperServerStats.select_database(server_id)
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
return (
|
||||
ServerStats.select()
|
||||
.where(ServerStats.server_id == server_id)
|
||||
.order_by(ServerStats.created.desc())
|
||||
.limit(1)
|
||||
.execute(database)
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def get_server_stats_by_id(server_id):
|
||||
HelperServerStats.select_database(server_id)
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
stats = (
|
||||
ServerStats.select()
|
||||
.where(ServerStats.server_id == server_id)
|
||||
.order_by(ServerStats.created.desc())
|
||||
.limit(1)
|
||||
.first(database)
|
||||
)
|
||||
return DatabaseShortcuts.return_rows(stats)[0]
|
||||
return model_to_dict(stats)
|
||||
|
||||
@staticmethod
|
||||
def server_id_exists(server_id):
|
||||
HelperServerStats.select_database(server_id)
|
||||
if not HelperServers.get_server_data_by_id(server_id):
|
||||
return False
|
||||
return True
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
# We can't use .exists because it doesn't seem to use the database parameter
|
||||
return (
|
||||
ServerStats.select()
|
||||
.where(ServerStats.server_id == server_id)
|
||||
.count(database)
|
||||
!= 0
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def sever_crashed(server_id):
|
||||
HelperServerStats.select_database(server_id)
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
ServerStats.update(crashed=True).where(
|
||||
ServerStats.server_id == server_id
|
||||
).execute()
|
||||
).execute(database)
|
||||
|
||||
@staticmethod
|
||||
def set_download(server_id):
|
||||
HelperServerStats.select_database(server_id)
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
ServerStats.update(downloading=True).where(
|
||||
ServerStats.server_id == server_id
|
||||
).execute()
|
||||
).execute(database)
|
||||
|
||||
@staticmethod
|
||||
def finish_download(server_id):
|
||||
HelperServerStats.select_database(server_id)
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
ServerStats.update(downloading=False).where(
|
||||
ServerStats.server_id == server_id
|
||||
).execute()
|
||||
).execute(database)
|
||||
|
||||
@staticmethod
|
||||
def get_download_status(server_id):
|
||||
HelperServerStats.select_database(server_id)
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
download_status = (
|
||||
ServerStats.select().where(ServerStats.server_id == server_id).get()
|
||||
ServerStats.select().where(ServerStats.server_id == server_id).get(database)
|
||||
)
|
||||
return download_status.downloading
|
||||
|
||||
@ -242,107 +244,109 @@ class HelperServerStats:
|
||||
if server_id is None:
|
||||
return
|
||||
|
||||
HelperServerStats.select_database(server_id)
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
ServerStats.update(crashed=False).where(
|
||||
ServerStats.server_id == server_id
|
||||
).execute()
|
||||
).execute(database)
|
||||
|
||||
@staticmethod
|
||||
def is_crashed(server_id):
|
||||
HelperServerStats.select_database(server_id)
|
||||
svr = ServerStats.select().where(ServerStats.server_id == server_id).get()
|
||||
# pylint: disable=singleton-comparison
|
||||
if svr.crashed == True:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
svr = (
|
||||
ServerStats.select().where(ServerStats.server_id == server_id).get(database)
|
||||
)
|
||||
return svr.crashed
|
||||
|
||||
@staticmethod
|
||||
def set_update(server_id, value):
|
||||
if server_id is None:
|
||||
return
|
||||
|
||||
HelperServerStats.select_database(server_id)
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
try:
|
||||
# Checks if server even exists
|
||||
ServerStats.select().where(ServerStats.server_id == server_id)
|
||||
except Exception as ex:
|
||||
ServerStats.select().where(ServerStats.server_id == server_id).execute(
|
||||
database
|
||||
)
|
||||
except DoesNotExist as ex:
|
||||
logger.error(f"Database entry not found! {ex}")
|
||||
return
|
||||
ServerStats.update(updating=value).where(
|
||||
ServerStats.server_id == server_id
|
||||
).execute()
|
||||
).execute(database)
|
||||
|
||||
@staticmethod
|
||||
def get_update_status(server_id):
|
||||
HelperServerStats.select_database(server_id)
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
update_status = (
|
||||
ServerStats.select().where(ServerStats.server_id == server_id).get()
|
||||
ServerStats.select().where(ServerStats.server_id == server_id).get(database)
|
||||
)
|
||||
return update_status.updating
|
||||
|
||||
@staticmethod
|
||||
def set_first_run(server_id):
|
||||
HelperServerStats.select_database(server_id)
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
# Sets first run to false
|
||||
try:
|
||||
# Checks if server even exists
|
||||
ServerStats.select().where(ServerStats.server_id == server_id)
|
||||
except Exception as ex:
|
||||
except DoesNotExist as ex:
|
||||
logger.error(f"Database entry not found! {ex}")
|
||||
return
|
||||
ServerStats.update(first_run=False).where(
|
||||
ServerStats.server_id == server_id
|
||||
).execute()
|
||||
).execute(database)
|
||||
|
||||
@staticmethod
|
||||
def get_first_run(server_id):
|
||||
HelperServerStats.select_database(server_id)
|
||||
first_run = ServerStats.select().where(ServerStats.server_id == server_id).get()
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
first_run = (
|
||||
ServerStats.select().where(ServerStats.server_id == server_id).get(database)
|
||||
)
|
||||
return first_run.first_run
|
||||
|
||||
@staticmethod
|
||||
def get_ttl_without_player(server_id):
|
||||
HelperServerStats.select_database(server_id)
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
last_stat = (
|
||||
ServerStats.select()
|
||||
.where(ServerStats.server_id == server_id)
|
||||
.order_by(ServerStats.created.desc())
|
||||
.first()
|
||||
.first(database)
|
||||
)
|
||||
last_stat_with_player = (
|
||||
ServerStats.select()
|
||||
.where(ServerStats.server_id == server_id)
|
||||
.where(ServerStats.online > 0)
|
||||
.order_by(ServerStats.created.desc())
|
||||
.first()
|
||||
.first(database)
|
||||
)
|
||||
return last_stat.created - last_stat_with_player.created
|
||||
|
||||
@staticmethod
|
||||
def can_stop_no_players(server_id, time_limit):
|
||||
HelperServerStats.select_database(server_id)
|
||||
can = False
|
||||
ttl_no_players = HelperServerStats.get_ttl_without_player(server_id)
|
||||
if (time_limit == -1) or (ttl_no_players > time_limit):
|
||||
can = True
|
||||
return can
|
||||
return (time_limit == -1) or (ttl_no_players > time_limit)
|
||||
|
||||
@staticmethod
|
||||
def set_waiting_start(server_id, value):
|
||||
HelperServerStats.select_database(server_id)
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
try:
|
||||
# Checks if server even exists
|
||||
ServerStats.select().where(ServerStats.server_id == server_id)
|
||||
except Exception as ex:
|
||||
ServerStats.select().where(ServerStats.server_id == server_id).execute(
|
||||
database
|
||||
)
|
||||
except DoesNotExist as ex:
|
||||
logger.error(f"Database entry not found! {ex}")
|
||||
return
|
||||
ServerStats.update(waiting_start=value).where(
|
||||
ServerStats.server_id == server_id
|
||||
).execute()
|
||||
).execute(database)
|
||||
|
||||
@staticmethod
|
||||
def get_waiting_start(server_id):
|
||||
HelperServerStats.select_database(server_id)
|
||||
database = HelperServerStats.select_database(server_id)
|
||||
waiting_start = (
|
||||
ServerStats.select().where(ServerStats.server_id == server_id).get()
|
||||
ServerStats.select().where(ServerStats.server_id == server_id).get(database)
|
||||
)
|
||||
return waiting_start.waiting_start
|
||||
|
||||
@ -708,6 +708,7 @@ class Server:
|
||||
)
|
||||
# cancel the watcher task
|
||||
self.server_scheduler.remove_job("c_" + str(self.server_id))
|
||||
self.server_scheduler.remove_job("stats_" + str(self.server_id))
|
||||
return
|
||||
|
||||
HelperServerStats.sever_crashed(self.server_id)
|
||||
@ -1137,6 +1138,7 @@ class Server:
|
||||
"desc": raw_ping_result.get("desc"),
|
||||
"version": raw_ping_result.get("version"),
|
||||
"icon": raw_ping_result.get("icon"),
|
||||
"crashed": self.is_crashed,
|
||||
}
|
||||
)
|
||||
if len(self.helper.websocket_helper.clients) > 0:
|
||||
@ -1161,6 +1163,7 @@ class Server:
|
||||
"desc": raw_ping_result.get("desc"),
|
||||
"version": raw_ping_result.get("version"),
|
||||
"icon": raw_ping_result.get("icon"),
|
||||
"crashed": self.is_crashed,
|
||||
},
|
||||
)
|
||||
total_players += int(raw_ping_result.get("online"))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user