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
3,760 Commits 12 Branches 45 Tags 104 MiB
1211b22183
Commit Graph

325 Commits

Author SHA1 Message Date
amcmanu3
52833d8126 Appease the linter 2023-02-10 18:03:49 -05:00
amcmanu3
923082b58d Pass tz object instead of text for tz fallback 2023-02-10 16:36:20 -05:00
amcmanu3
87fdb1627c Add feature - ignore exit codes on crash detection 2023-02-10 14:02:26 -05:00
amcmanu3
0afa2cfd97 Add dir calc to separtate schedule- reduce latency 2023-02-05 13:08:04 -05:00
amcmanu3
e43c63a8b7 Fix db not found issue 
Add page feedback.
 2023-01-30 18:31:46 -05:00
Zedifus
e217c63fdf Merge branch 'dev' into bug/ReworkDefautPublicHandler 2023-01-27 19:59:12 +00:00
Zedifus
b5d259bce7 Merge branch 'dev' into feature/backup-echo 2023-01-27 19:39:05 +00:00
Silversthorn
4248174041 Fixing Double Migration at Startup 2023-01-25 23:20:45 +01:00
Andrew
58f6448784 Move sleep into shutdown block 2023-01-21 13:16:01 -05:00
Andrew
248a5a63a9 Include option for after command 2023-01-21 13:13:02 -05:00
Andrew
cf9ad77879 Add option to run command before backup 2023-01-20 17:35:30 -05:00
amcmanu3
6dfabab4af Set backup filename to use same time as schedule 2023-01-17 10:27:55 -05:00
Zedifus
c80d357f13 Fix CodeQuality, line length 2023-01-02 20:59:29 +00:00
Silversthorn
9dac0b5d85 Adding Forge Installer Compaptibility with old versions 2022-12-22 19:32:56 +01:00
Andrew
d5cc4529b0 Add try/except for not finding run file 2022-12-21 21:55:21 -05:00
Andrew
e8564566ed Appease the linter 2022-11-19 18:21:10 -05:00
Silversthorn
b4dca8b27f Merge branch 'feature/forge-install' of gitlab.com:crafty-controller/crafty-4 into feature/forge-install 2022-11-19 23:20:26 +01:00
Silversthorn
004049f6da Using Regex to Extract Infos from Forge Scripts 2022-11-19 23:20:21 +01:00
Andrew
32cdde0616 Fix failed imports 2022-11-19 16:13:44 -05:00
Andrew
e42af36103 Make sure import status persists through install 2022-11-19 14:41:15 -05:00
Andrew
ad4603aafb Add automated forge server creation installs 2022-11-19 13:45:18 -05:00
Andrew
23b3e642a0 Only collect server stats when clients 2022-10-20 15:33:51 -04:00
Zedifus
0829331534 Appease Minor and Major lint issues in !464 2022-09-19 23:49:16 +01:00
Andrew
f5cdd9f573 Check to "which java" doesn't return none 2022-09-19 11:13:35 -04:00
amcmanu3
011b66e1df Fix server startup after update 2022-09-04 19:06:07 -04:00
amcmanu3
76a499f5a4 Fix start server after updates 
Fix update notifs
 2022-09-04 17:50:08 -04:00
Zedifus
7f95f7085d Merge branch 'dev' into feature/bedrock-creation 2022-09-04 21:12:47 +01:00
Andrew
dd56b4be37 update updates 2022-09-03 13:42:30 -04:00
Andrew
1f95ad600c Add return 2022-09-03 13:26:51 -04:00
Andrew
5d688522bd Fix backup logic 2022-09-03 13:23:30 -04:00
Andrew
6559112e1b Fix update logic 2022-09-03 13:16:03 -04:00
Andrew
9a7a1cc5d8 Change elif to else 2022-09-03 12:46:35 -04:00
amcmanu3
d5ecfe9128 Add spinner to update button 2022-09-01 12:46:37 -04:00
amcmanu3
bd38fcd6e4 Add try/except around download 2022-08-31 19:59:46 -04:00
amcmanu3
a07eb58db7 Add bedrock server creation 2022-08-31 19:45:19 -04:00
Zedifus
96c4fa3bdd Validate bedrock url before download with urllib 
Even though there will be an incredibly small chance of tampering
this is to make bandit happy
"Bandit Test ID B310"
https://stackoverflow.com/a/53040523/18355876
 2022-08-31 20:04:39 +01:00
Zedifus
0c9e10f18a Fix sec overly permissive file permissions 
775 is too permissive for this  file, '-rwxr--r--' is more than enough
B103: Test for setting permissive file permissions
https://bandit.readthedocs.io/en/latest/plugins/b103_set_bad_file_permissions.html
 2022-08-31 19:50:35 +01:00
Zedifus
fdf1a5a41d Add url helper to bedrock update 2022-08-31 19:46:07 +01:00
Andrew
600de2be0c Fix executable backups 
Cleanup after ourselves
 2022-08-31 12:18:52 -04:00
Andrew
266e540374 Add bedrock update support 2022-08-31 11:59:33 -04:00
Zedifus
fdb98cf1f8 Merge branch 'dev' into feature/pretzel-metrics-graph 2022-08-27 18:00:36 +01:00
Zedifus
b0b04a6495 Merge branch 'dev' into feature/pretzel-variable-shutdown-timeout 2022-08-27 17:50:50 +01:00
Andrew
037758accb Working live graph 2022-08-22 20:04:40 -04:00
Andrew
9d961215a5 Fix logical bug with shutdown log/console prompts 2022-08-21 13:00:24 -04:00
Andrew
44afc72d3a Add variable shutdown timeouts 2022-08-21 12:41:28 -04:00
amcmanu3
65c8ca680b Add importing threading to jar servers. 
Refactor "downloading" status
 2022-08-17 14:48:05 -04:00
amcmanu3
f6975912f4 Only list zip files in backups list 2022-08-07 12:19:58 -04:00
Zedifus
6c901e5e3e Merge branch 'dev' into bug/pretzel-backup-restart 2022-08-05 00:20:20 +01:00
Iain Powrie
5353cd854f Change sleep from 60 to 3 2022-08-04 23:18:01 +00:00
amcmanu3
18a0b95d29 Fix lint issues 2022-08-04 18:34:43 -04:00
Andrew
ad0d47c357 Check for server backup on restart 2022-07-30 14:47:07 -04:00
Andrew
af009a96d9 Fix bug where no java reg path found stack 2022-07-30 13:17:01 -04:00
Andrew
2ddc1e7c96 Remove server.props requirement 2022-07-16 19:05:00 -04:00
Andrew
118924eeaa Fix one more stop where this as an issue 2022-06-23 21:57:50 -04:00
Andrew
b4749f8caf Fix 2 bugs: Stats startup after backup 
Server java version path bug
 2022-06-23 19:34:27 -04:00
Zedifus
610b94dd59 Merge branch 'dev' into tweak/file-enhancements 2022-06-21 20:41:09 +01:00
amcmanu3
7670b91cc6 Add backup shutdown feature 
Add backup notif for failed backup
 2022-06-20 17:16:56 -04: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
Iain Powrie
1de2ea1b5c Merge branch 'bug/-1-stats-showing-on-dashboard' into 'dev' 
Fix -1 showing on dashboard when offline

See merge request crafty-controller/crafty-4!365
 2022-06-18 21:27:05 +00:00
Andrew
478dfdc6ef Fix -1 showing on dashboard when offline 2022-06-18 17:18:21 -04:00
Andrew
9bbf316494 Check for Oracle Java before changing start string 2022-06-17 19:11:03 -04:00
Andrew
a2ad23548c Check for Oracle Java before changing start string 2022-06-17 19:08:57 -04:00
luukas
5bfd564ef4
Use with-blocks when opening files 2022-06-18 01:27:55 +03:00
Zedifus
5f8dbd4dc7 Fix C0113 & Exempting R0201 Line as self required. 2022-06-15 04:27:27 +01:00
Zedifus
1cfc926b16 Fix line length CQ 2022-06-15 04:11:40 +01:00
amcmanu3
cda2120579 Fix window java issue causing no stats 2022-06-14 22:33:02 -04:00
luukas
e73dd682c8
Fix no-else-* QA warnings 2022-06-14 15:40:57 +03:00
amcmanu3
55f7ab1d35 Fix traceback on crash detection startup 2022-06-13 16:13:18 -04:00
amcmanu3
033bf05279 Appease black 2022-06-13 14:31:53 -04:00
amcmanu3
b3f167ab62 Add fallback for tz not being found 2022-06-13 14:29:25 -04:00
Silversthorn
a9cdd33c77 Fixing Pylint Errors 2022-06-12 18:30:39 +02:00
Silversthorn
007218111f Should work now :) 2022-06-12 17:13:39 +02:00
Andrew
c924663ab3 Fix stack on server stop 2022-06-10 19:04:34 -04:00
Andrew
41cf247c5a Appease black 2022-06-10 18:31:48 -04:00
Andrew
4a15a2331e Fix error when stats job does not exist on kill 2022-06-10 18:29:47 -04:00
amcmanu3
d7606f4cc6 Fix user permissions issue 2022-06-06 17:04:45 -04:00
Andrew
8e23ba5bdb Fix backup error if excluded dir doesn't exists. 2022-06-06 00:05:16 -04:00
amcmanu3
dd54a5f2c9 Mark update as complete when it fails 2022-06-03 16:04:12 -04:00
Silversthorn
9e4c8e99b1 Merge branch 'dev' into dev-StatsDBImprovement 2022-06-01 23:52:49 +02:00
Andrew
9864cecff1 Merge branch 'experimental/lukas-codebase-improvements' into 'dev' 
Lukas's codebase improvements

See merge request crafty-controller/crafty-4!277
 2022-06-01 20:22:47 +00:00
luukas
89b6e239bc
Merge branch 'dev' into experimental/lukas-codebase-improvements 2022-06-01 22:35:11 +03:00
Andrew
3946a926bf Remove print statement 2022-06-01 15:17:13 -04:00
Zedifus
de96844276 Remove useless return from a_backup_server 
(Pylint R1711)
 2022-06-01 18:34:04 +01:00
Zedifus
256c6567fd Remove temporary directory on backup completion 
When running backups, the temporary directory wasn't being properly removed.
Added logic to remove the temporary directory upon backup completion,
cleaned up the try/except a bit.
 2022-06-01 18:28:24 +01:00
luukas
e0b0e52bd5
Add stdin route for the API 2022-05-31 00:11:17 +03:00
Silversthorn
150e8e5794 Renaming Server in shared to ServerInstance 2022-05-30 22:40:34 +02: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
Silversthorn
99b28efd33 Merge branch 'dev' into dev-StatsDBImprovement 2022-05-26 15:39:52 +02:00
Silversthorn
056856cf98 Fixing Helpers issue 2022-05-26 15:02:47 +02:00
Silversthorn
8423cc24c1 I'm breaking/fixing stuff 2022-05-26 14:50:20 +02:00
Andrew
b293164e12 Add crash detection to realtime stats 2022-05-25 14:26:13 -04:00
Silversthorn
5a1353373a trying something new 2022-05-25 15:54:35 +02:00
luukas
4e84eee5a5
Rename server stats variables to server_stats 2022-05-25 16:15:51 +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
42af86b6f7 Merge branch 'dev' into experimental/lukas-cleanup 2022-05-17 21:21:47 +03:00
luukas
e7e337bea1 Improve the start_server function 2022-05-16 18:16:04 +03:00
Andrew
7d8515321b Revert bad changes for schedules 2022-05-15 15:59:55 -05:00
Andrew
4f6a90eb6a Remove unused import 2022-05-15 14:05:23 -05:00