NussNougate/crafty-4
2
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2025-01-19 01:35:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tweak/logging' into 'dev'

Browse Source 
Set some stats logging to debug

See merge request crafty-controller/crafty-4!635
This commit is contained in:
Iain Powrie 2023-10-07 14:50:23 +00:00
commit 3de57ec4b2
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -24,6 +24,7 @@
- Make files hover cursor pointer ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/627)) - Make files hover cursor pointer ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/627))
- Use `Jar` class naming for jar refresh to make room for steamCMD naming in the future ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/630)) - Use `Jar` class naming for jar refresh to make room for steamCMD naming in the future ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/630))
- Improve ui visibility of Build Wizard selection tabs ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/633)) - Improve ui visibility of Build Wizard selection tabs ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/633))
- Add additional logging for server bootstrap & moves unnecessary logging to `debug` for improved log clarity ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/635))
### Lang ### Lang
TBD TBD
<br><br> <br><br>

2
app/classes/minecraft/stats.py
View File

@ -226,7 +226,7 @@ class Stats:
def get_server_players(self, server_id): def get_server_players(self, server_id):
server = HelperServers.get_server_data_by_id(server_id) server = HelperServers.get_server_data_by_id(server_id)
logger.info(f"Getting players for server {server}") logger.debug(f"Getting players for server {server['server_name']}")
internal_ip = server["server_ip"] internal_ip = server["server_ip"]
server_port = server["server_port"] server_port = server["server_port"]

6
app/classes/shared/server.py
View File

@ -834,6 +834,7 @@ class ServerInstance:
f"Assuming it was never started." f"Assuming it was never started."
) )
if self.settings["stop_command"]: if self.settings["stop_command"]:
logger.info(f"Stop command requested for {self.settings['server_name']}.")
self.send_command(self.settings["stop_command"]) self.send_command(self.settings["stop_command"])
self.write_player_cache() self.write_player_cache()
else: else:
@ -903,6 +904,9 @@ class ServerInstance:
if not self.check_running(): if not self.check_running():
self.run_threaded_server(user_id) self.run_threaded_server(user_id)
else: else:
logger.info(
f"Restart command detected. Sending stop command to {self.server_id}."
)
self.stop_threaded_server() self.stop_threaded_server()
time.sleep(2) time.sleep(2)
self.run_threaded_server(user_id) self.run_threaded_server(user_id)
@ -1679,7 +1683,7 @@ class ServerInstance:
def get_server_players(self): def get_server_players(self):
server = HelperServers.get_server_data_by_id(self.server_id) server = HelperServers.get_server_data_by_id(self.server_id)
logger.info(f"Getting players for server {server}") logger.debug(f"Getting players for server {server['server_name']}")
internal_ip = server["server_ip"] internal_ip = server["server_ip"]
server_port = server["server_port"] server_port = server["server_port"]