From d1906751e55393e2f51ed80290244a272a280a61 Mon Sep 17 00:00:00 2001 From: Phillip Tarrant Date: Mon, 31 Aug 2020 13:53:46 -0400 Subject: [PATCH] Moved server to shared in prep for plugins --- app/classes/shared/controller.py | 2 +- app/classes/{minecraft => shared}/server.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename app/classes/{minecraft => shared}/server.py (98%) diff --git a/app/classes/shared/controller.py b/app/classes/shared/controller.py index 7b19e9f9..af9bcaed 100644 --- a/app/classes/shared/controller.py +++ b/app/classes/shared/controller.py @@ -9,7 +9,7 @@ from app.classes.shared.console import console from app.classes.shared.models import db_helper -from app.classes.minecraft.server import Server +from app.classes.shared.server import Server from app.classes.minecraft.server_props import ServerProps logger = logging.getLogger(__name__) diff --git a/app/classes/minecraft/server.py b/app/classes/shared/server.py similarity index 98% rename from app/classes/minecraft/server.py rename to app/classes/shared/server.py index 58419060..8a90c460 100644 --- a/app/classes/minecraft/server.py +++ b/app/classes/shared/server.py @@ -67,8 +67,8 @@ class Server: schedule.every(delay).seconds.do(self.run_scheduled_server) def run_scheduled_server(self): - console.info("Starting Minecraft server ID: {} - {}".format(self.server_id, self.name)) - logger.info("Starting Minecraft server {}".format(self.server_id, self.name)) + console.info("Starting server ID: {} - {}".format(self.server_id, self.name)) + logger.info("Starting server {}".format(self.server_id, self.name)) self.run_threaded_server() # remove the scheduled job since it's ran