Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug/import3-servers' into 'dev'

Browse Source 
Fix no id on import3 servers

See merge request crafty-controller/crafty-4!442
This commit is contained in:
Iain Powrie 2022-09-02 12:32:48 +00:00
commit ed647604ba
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@
TBD
### Bug fixes
- Fix performance issues on server metrics panels (Temporarily setting to 24hr query) ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/440))
- Fix no id on import3 servers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/442))
### Tweaks
TBD
### Lang

2
app/classes/shared/import3.py
View File

@ -74,6 +74,7 @@ class Import3:
min_mem=(int(server["memory_min"]) / 1000),
max_mem=(int(server["memory_max"]) / 1000),
port=server["server_port"],
user_id=HelperUsers.get_user_id_by_name("system"),
)
Console.info(
f"Imported server {server['server_name']}[{server['id']}] "
@ -91,6 +92,7 @@ class Import3:
min_mem=(int(json_data["memory_min"]) / 1000),
max_mem=(int(json_data["memory_max"]) / 1000),
port=json_data["server_port"],
user_id=HelperUsers.get_user_id_by_name("system"),
)
Console.info(
f"Imported server {json_data['server_name']}[{json_data['id']}] "