Zedifus
44f3b903d4
Merge branch 'dev' into Fix-Pylint-no-self-use
2022-07-18 21:09:26 +01:00
Andrew
2ddc1e7c96
Remove server.props requirement
2022-07-16 19:05:00 -04:00
Silversthorn
9f30ca3931
Fix pylint no-self-use
2022-07-16 09:52:30 +02:00
luukas
4f7e1bfa24
Check for None when getting the CPU frequency data
...
Default to -1 when an error occurs
2022-07-06 19:00:17 +03:00
amcmanu3
6f80b3e5c1
Fix bug with bool obj on server start
2022-07-05 15:24:19 -04:00
Zedifus
4bfbf9ea47
Merge branch 'dev' into bug/ping-data
2022-06-21 04:09:35 +01:00
Andrew
7d286e60e0
Backup/Config.json rework for API key hardening
...
See merge request crafty-controller/crafty-4!369
2022-06-20 19:26:21 +00:00
amcmanu3
ccfbad91d1
Check if ping result is boolean
2022-06-19 23:07:48 -04:00
Andrew
478dfdc6ef
Fix -1 showing on dashboard when offline
2022-06-18 17:18:21 -04:00
luukas
abc34ef2b6
Add better error logging for statistic collection
2022-06-17 16:19:37 +03:00
Zedifus
5f8dbd4dc7
Fix C0113 & Exempting R0201 Line as self required.
2022-06-15 04:27:27 +01:00
luukas
e73dd682c8
Fix no-else-* QA warnings
2022-06-14 15:40:57 +03:00
luukas
b0e356f999
Fix host stats error messages
2022-05-28 19:43:37 +03:00
luukas
0df5fedf2b
Add try-excepts for host stats
2022-05-28 19:32:54 +03:00
luukas
d1beb2f125
Redirect stderr to null during psutil's import.
...
On some systems /proc might be unavailable and psutil would freak out
printing several exceptions to stderr but strangely not raising the
exceptions for upper scope to handle
2022-05-28 19:00:25 +03:00
luukas
83018c6860
Calculate the min stats date with timedelta
...
This is more correct than just using days.
I've also tested this working in a completely separate Peewee project.
2022-05-25 16:14:42 +03:00
luukas
a937a94ac8
Use a better variable name for stat disappear date
...
* Rename occurences of `last_week` with `minimum_to_exist`
2022-05-25 14:49:17 +03:00
luukas
f82241f728
Fix circular import and linting for stats.py
2022-05-20 23:33:42 +03:00
luukas
c1ebb16dff
Add typings to minecraft/stats.py
2022-05-20 22:05:37 +03:00
luukas
559a345f25
Merge branch 'dev' into merge/api-v2
2022-05-18 01:49:19 +03:00
luukas
53459d83dc
Merge branch 'feature/api-v2' into merge/api-v2
2022-05-05 03:32:09 +03:00
Silversthorn
16bbac7fd6
Moving Server Stats DB to Server Folder
2022-04-28 22:40:15 +02:00
Zedifus
92c8fc04f3
Refactor to standardize class/variable naming ✨
2022-04-14 03:10:25 +01:00
computergeek125
d417950eae
fix fstrings, refactored console to static
2022-04-11 20:34:46 -05:00
Zedifus
b5cac0e385
Fix remaining minor lint warnings
...
These can't be handled by ⬛ black automatically
2022-04-11 11:14:32 +01:00
Zedifus
19f2429a4c
Fix formatting to comply with ⬛ Black
2022-04-11 11:08:36 +01:00
computergeek125
42ca4bb973
Refactored the yes to not pass objects in import
...
Merge Conflicts ᴙ Us
2022-04-11 00:23:55 -05:00
Zedifus
2a512d7273
Fix files to conform with new ⚫ Black pylintrc
...
Mostly just breaking up strings and comments into new lines
Some strings dont require 'f' but keeping in for readability
with the rest of the concatinated string
2022-03-23 06:06:13 +00:00
Zedifus
e06fe8a52a
⬛ Black codebase
...
Apply black formatting to codebase
2022-03-23 02:50:12 +00:00
Zedifus
b306d1f313
Tidy imports & dep auto-installer
2022-03-08 04:40:44 +00:00
Silversthorn
843c16bbd7
Fixing icon bug
2022-03-04 21:09:13 +01:00
amcmanu3
d5c623b928
Merge branch 'dev' into dev-RefreshStats_Threading
2022-03-03 19:57:06 -05:00
amcmanu3
ab7889914f
Bug fixes to ensure player stats display correctly
...
Add sync indicator to dashboard
2022-03-03 19:41:30 -05:00
Andrew
d73316119b
Add server download status indicator
2022-03-04 00:36:36 +00:00
Silversthorn
d016e0a59a
Broke Things
2022-03-03 22:01:12 +01:00
Andrew
7707940743
Appease the linter
2022-03-02 10:36:24 -05:00
Andrew
23641f4033
Fix for keyerror when mc server can't be polled early enough
2022-03-01 22:45:44 -05:00
Andrew
c8267bee80
Catch key error players for stats - silently log it. Fix for human readable file size
2022-03-01 22:30:53 -05:00
Andrew
983022c5bb
make file size calc more efficient
2022-03-01 22:14:50 -05:00
Andrew
322134506b
Remove minecraft specific naming/stats
2022-03-01 21:43:36 -05:00
amcmanu3
de3ec1fa3b
Expand except to be more general to catch windows connection forcibly closed error
2022-03-01 19:47:29 -05:00
Andrew
c8c1f301c0
Fix server importing for bedrock that's not a zip
2022-03-01 18:31:38 -05:00
Andrew
e1340d61ff
Appease the linter
2022-03-01 17:10:04 -05:00
Andrew
5d6ada23a4
Fix visual file loading order. Fix zip imports where directories were not being copied
2022-03-01 16:54:06 -05:00
Andrew
10d3afab58
Fix bug where int mc ping was not defined for bedrock servers
2022-03-01 13:52:57 -05:00
Andrew
22d519b4df
Remove print statements
2022-03-01 12:59:08 -05:00
Andrew
bbddbbf646
Patch issue where guid was a string trying to be made into bytes
2022-03-01 12:58:39 -05:00
Andrew
d760fcb010
Appease the linter
2022-03-01 01:14:26 -05:00
Andrew
11278ebe5f
Added translation for backup start/end messages. Finalize bedrock support. Removed confusion so server stats won't be shown if server isn't running.
2022-03-01 00:33:09 -05:00
Andrew
fbe9a7659d
Few updates to MC bedrock ping
2022-02-28 22:57:16 -05:00
Andrew
3c48364998
BEDROCK SUPPORT. Ping works. Add notification for backups starting and completing.
2022-02-28 22:40:11 -05:00
Andrew
f3d5f4f454
Fix Bedrock for linux
2022-02-26 12:12:02 -05:00
amcmanu3
311d3e7411
Inital changes for bedrock stats recording
2022-02-10 20:28:40 -05:00
Andrew
540584990e
Inital bedrock support
2022-02-10 18:20:36 -05:00
Andrew
c89609ae61
Inital bedrock support
2022-02-10 15:27:40 -05:00
Andrew
85eef71b9e
Add max player/total player to stats keeping on dashboard
2022-01-27 18:16:27 -05:00
Iain Powrie
e0ce1d118c
Create pylintrc, code review pipeline & correct codebase errors
...
Fix uploads,
Only send server stats to user page when they have access to servers
2022-01-26 01:45:30 +00:00
Andrew
b4bf125a0d
Notifications are only visible to valid server users
2022-01-20 13:37:45 -05:00
Silversthorn
f20d41242d
Adding Helpers for Path
...
Correcting a MVC update missing function
2021-11-21 11:52:29 +01:00
Iain Powrie
1c9ffb2abc
Merge branch 'dev' into 'subprocess'
...
# Conflicts:
# app/classes/shared/helpers.py
# app/classes/shared/server.py
# app/classes/web/ajax_handler.py
2021-11-06 15:26:37 +00:00
Silversthorn
04a2de14fd
Correction for status Page
2021-09-27 21:52:50 +02:00
Silversthorn
057379d888
Fixing Remove Roles when Removing a Server
2021-09-26 00:17:06 +02:00
Silversthorn
eb3b86641d
Fixing Server Deletion Error
2021-09-25 23:59:01 +02:00
Silversthorn
05ced7610e
Correction of undefined db_helper following merge
2021-09-25 23:05:49 +02:00
computergeek125
250b68ae51
Protype subprocess management
2021-09-25 14:29:28 -05:00
Silversthorn
186dcdc616
Merge branch 'dev-Silversthorn' into dev-Silversthorn-MVC
2021-09-21 21:12:56 +02:00
Andrew
afb95dc828
Final change for port ping issues
2021-09-13 20:08:38 -04:00
Andrew
f594c7a638
Fixes server-port/ip not updating after config change for stats.
2021-09-13 19:18:56 -04:00
Andrew
92725d2249
Starts troubleshooting of port not changing after config change.
2021-09-13 17:52:09 -04:00
Silversthorn
70ca82a086
Rework architecture for better MVC
2021-09-09 00:01:10 +02:00
Silversthorn
3ff3d0ccf1
Adding MOTD on Status Page
2021-08-29 00:48:30 +02:00
Silversthorn
a05b3a8634
Status Improvements and Fix
2021-08-28 01:48:46 +02:00
Andrew
48c70279f7
Fixes error thrown when server download doesn't finsih before server creation ends.
...
Adds notification when download is complete.
2021-08-26 22:43:11 -04:00
Andrew
c8759ac872
Added serverdownload to thread.
...
Removed exit command if server jar doesn't exist. This was causing exit.txt to constantly try to stop crafty after a jar download in the thread.
2021-08-21 14:25:39 -04:00
luukas
5a5cd65d4f
Sort server types, I suffered a lot while doing this
2021-06-02 21:17:50 +03:00
luukas
9049e44803
Fix logging on import errors
2021-04-17 23:34:13 +03:00
computergeek125
506c9bb3c3
Merge branch 'backups-and-stuff' into dev
2021-03-21 23:32:48 -05:00
computergeek125
81c60d6dac
One monster truck commit for rework and backups
2021-03-21 23:02:18 -05:00
Andrew
287d45a1bc
Port/ip-get patched
...
Patched super user in panel_handler
2021-03-13 09:29:05 -05:00
Andrew
03d7cfae80
Port/ip-get patched
...
Patched super user in panel_handler
Working issue is the server doesn not reload settings from DB after value changes in table.
!!CAUTION LOTS OF PRINT STATEMENTS!!
2021-03-09 16:57:45 -05:00
Andrew
58f6949fad
Port/ip-get patched
...
Working issue is the socket will only work for 25565.
!!CAUTION LOTS OF PRINT STATEMENTS!!
2021-03-08 22:01:42 -05:00
luukas
1be41b8534
Player controls
2021-03-05 10:58:38 +02:00
computergeek125
8bba57d950
Added exception handler if the initial request fails
2020-12-25 15:40:55 -05:00
computergeek125
8795a1eaf5
Fixed crash on CPU speed reading for certain systems
2020-12-19 08:39:31 -05:00
Phillip Tarrant
c896a12b17
Added server_ip to DB, also removed
...
max_stats_count as it's not needed
2020-09-22 12:11:16 -04:00
Phillip Tarrant
fbc8e7fc2a
fixed broken return / redirect after downloading jar and adding server
2020-09-10 12:03:18 -04:00
Phillip Tarrant
66d7c6f10a
Refactored the server add outside of serverjars.py (since it's going away). Also made it more flexible since we are doing more than just jars now
2020-09-10 11:01:57 -04:00
Phillip Tarrant
c5bf170a33
added audit logging, and commands logging, command handler and other stuff
2020-08-31 16:16:45 -04:00
Phillip Tarrant
d1906751e5
Moved server to shared in prep for plugins
2020-08-31 13:53:46 -04:00
Phillip Tarrant
d6c894c3d9
Creation of Command model, moved controler to shared in prep for plugins
2020-08-31 13:46:25 -04:00
Phillip Tarrant
14f05f6946
fixed server_port bug in server builder
2020-08-27 18:36:18 -04:00
Phillip Tarrant
d2d403e144
complete rewrite of stats pulling, fixed default.json, changed the config file and handling
2020-08-27 18:30:56 -04:00
Phillip Tarrant
637407cc78
adding memory percent
2020-08-25 09:29:11 -04:00
Phillip Tarrant
d0720958f9
Error handling if server was deleted without crafty knowing
...
start/stop server functions complete
expanding out online/max/motd etc in db for easier parsing
fixed issue of servers loosing their name from 3.2
finished restart button
added fontawesome 5
2020-08-24 19:11:17 -04:00
Phillip Tarrant
a958b6dea0
populating dashboard with real data
2020-08-24 13:08:17 -04:00
Phillip Tarrant
a0fcda018c
Fixed errand print statement
...
Re-init all servers when adding a server
server builder tested well. Next is importing a server
2020-08-23 22:17:36 -04:00
Phillip Tarrant
6ec2f1c6ac
part 1 of the server builder complete
2020-08-23 18:43:28 -04:00
Phillip Tarrant
81d5ff05e8
fixed endless redirect issue on non-existant paths
2020-08-19 13:21:19 -04:00
Phillip Tarrant
de98e5727c
Implimenting default.json search for user/pass creation
2020-08-18 21:50:24 -04:00
Phillip Tarrant
203441045f
Added crafty specific stuff to config.ini
2020-08-18 21:04:43 -04:00
