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
Andrew
490fc86d4e
Cleanup server schedule on delete
2022-05-15 14:00:24 -05:00
Andrew
e161e2cf0b
Add cleanup method for server stats on delete
2022-05-15 13:28:02 -05:00
Andrew
0f19c0c787
Realtime server stats all the time
2022-05-15 13:16:28 -05: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
Andrew
ed60e55ffe
Add try catch around process kill
2022-04-12 21:52:53 -04:00
Andrew
e555274409
Add critical log message for None Backup path
2022-04-12 19:27:18 -04:00
Andrew
73b3571606
Appease the linter
2022-04-12 19:22:57 -04:00
Andrew
ec6421b62c
Disable Backups when no path
2022-04-12 17:37:20 -04:00
computergeek125
d417950eae
fix fstrings, refactored console to static
2022-04-11 20:34:46 -05: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
Andrew
d4a1efba78
Appease the linter
2022-03-13 09:26:38 -04:00
Andrew
3a8174cc22
Add status bar for support log archive
2022-03-13 08:29:26 -04:00
Andrew
6e4435c86f
Add Full support for backup status
2022-03-13 06:36:44 -04:00
Andrew
33cad6afa8
Add percentage to backups page
...
Helper designed to be used for support logs as well.
2022-03-11 00:19:05 -05:00
Andrew
319e06cd10
Add backend percentage to backups
2022-03-09 23:45:49 -05:00
Zedifus
b306d1f313
Tidy imports & dep auto-installer
2022-03-08 04:40:44 +00:00
Andrew
eda9f44b5f
Merge branch 'bug/backups-restore/download' into 'dev'
...
Bug/backups restore/download
See merge request crafty-controller/crafty-commander!197
2022-03-08 02:56:52 +00:00
amcmanu3
abdefc3e43
Ensure stats schedule is removed on server start
2022-03-07 21:48:06 -05:00
Iain Powrie
9c99346bbe
3.5 Translations (Squashed)
...
Thank you translators <3 you're all amazing!
2022-03-08 01:22:30 +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
dfa9ab40ca
Appease the linter
2022-03-03 19:47:49 -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
cb1679806e
Seperate refresh statistics for each server
...
Fixing Broken Things
2022-03-03 23:13:40 +01:00
Silversthorn
d016e0a59a
Broke Things
2022-03-03 22:01:12 +01:00
Andrew
e0b8fb35fe
Add option to compress backups
2022-03-02 11:34:26 -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
3c48364998
BEDROCK SUPPORT. Ping works. Add notification for backups starting and completing.
2022-02-28 22:40:11 -05:00
xithical
c4f706d415
Rework of files handling and added exclusions selection for backups.
2022-03-01 01:02:30 +00:00
xithical
26014d0e86
Revert "Merge branch 'xithical-fixes' into 'dev'"
...
This reverts merge request !173
2022-02-28 04:40:33 +00:00
xithical
7f98e39503
Appease the linter
2022-02-27 21:25:00 -06:00
xithical
5758d64e96
Merge branch 'dev' into 'xithical-fixes'
...
# Conflicts:
# app/classes/web/ajax_handler.py
# app/frontend/templates/panel/server_backup.html
2022-02-28 03:04:23 +00:00
Andrew
3621672e81
appease the linter
2022-02-27 22:03:19 -05:00
xithical
4b484782c6
Fix excluded directories not being separatable
...
Excluded directories were being pulled from the database as not a string, so I just used the get_backup_config() method to pull exclusions as a string so I could split it
2022-02-27 13:38:16 -06:00
xithical
cf5bfe88c1
Better documentation for backup logic
2022-02-27 13:21:54 -06:00
xithical
eaca8acf72
Clean up backup server method for readability
2022-02-27 13:17:14 -06:00
xithical
7c5bb0984c
Add logic for removing excluded files/dirs from backups
...
Updated backup thread to copy all server files to a temporary directory, iterate through excluded directory list, remove excluded directories/files, then create the backup archive
2022-02-27 13:11:22 -06:00
Andrew
dfed1cbedc
Add check to make sure server file is downloaded before attempting to start
2022-02-27 12:22:52 -05:00
Andrew
879197a3e9
Fix typo in server.py
2022-02-26 12:31:55 -05:00
Andrew
18e2ac8328
Change zip import execution string to the correct one
...
Fix front end for bedrock imports
Add server type to details
2022-02-26 12:29:07 -05:00
Andrew
733b5c9a2c
Add the right env variable for bedrock on linux
2022-02-26 11:59:19 -05:00
Andrew
92f9bceaf9
Revert to original popen scheme
2022-02-26 11:51:28 -05:00
Andrew
b6b8a1c14a
Add env parameter to popen
2022-02-26 11:29:36 -05:00
Andrew
e3669a2483
Add check for non-windows running bedrock to set env variable
2022-02-26 11:25:08 -05:00
Andrew
a908a3a7ac
Remove un-needed print statement
2022-02-22 18:03:47 -05:00
Andrew
c263a4a22b
Fix /stop /restart issue. /restart does not actually restart the server right now
2022-02-11 01:16:45 -05:00
Andrew
3995560ba2
Enable/disable crash detection on setting change in config
2022-01-30 21:04:08 -05:00
Andrew
e69a3be381
Fix bug where stopping a server without crash detection would crash crafty...ironic, I know.
2022-01-30 15:28:48 -05:00
Andrew
453da9cc24
Fix more things linting broke
2022-01-29 00:08:55 -05:00
Andrew
d1db65dc9c
Fix typo when messages from players are written
2022-01-28 19:00:14 -05:00
Andrew
51a07a1f0d
Fix for server reporting updating when it's not
2022-01-27 22:29:18 -05:00
Andrew
a1d5f9c084
Fix for server reporting updating when it's not
2022-01-27 22:27:24 -05:00
Andrew
005ac1216e
Add crash detection
2022-01-27 20:43:23 -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
xithical
5adfc613d8
Merge branch 'dev' of http://gitlab.com/crafty-controller/crafty-commander into dev
2022-01-21 23:09:04 -06:00
xithical
09aab2a250
Add path to server backup log notification
...
Adds the server path that is being passed to `shutil` to the log entry for backups to more easily identify cases where backups loops are occurring
2022-01-21 23:06:37 -06:00
Andrew
e35a2b3753
Add refresh send for buttons to update after server start/stop. Refresh is only sent to clients with server access
2022-01-21 20:43:44 -05:00
Andrew
b4bf125a0d
Notifications are only visible to valid server users
2022-01-20 13:37:45 -05:00
Andrew
2d169e8f97
Add terminal catches for server stop command and restart command in crafty's terminal
2022-01-18 15:42:26 -05:00
Andrew
5087813900
add catch for restart command. Fix windows bug.
2022-01-18 14:43:22 -05:00
Andrew
2f1b56121a
fix windows path bug
2022-01-18 13:59:53 -05:00
Andrew
bda81b8e20
Add delay on logs download start for on screen messages
2022-01-18 13:16:09 -05:00
Andrew
ccc41b7419
fix bug where crash detection was still using schedule
2022-01-14 19:52:51 -05:00
Andrew
2689a579a7
fix bug where transveral would be true every delete file due to typo
2022-01-14 16:06:02 -05:00
Andrew
c736c2eec1
Fix for tzdata
2022-01-14 14:59:06 -05:00
Andrew
210b831a47
remove schedule import from servers
2022-01-14 12:57:23 -05:00
Andrew
ef4a31d1e8
Attempt fix for delayed start issues - was finally able to reproduce
...
Port feature from 3.4 added by Trevor (@uplusion23) for terminal history.
Add datatable to mobile version of tasks.
2022-01-14 02:35:26 -05:00
Andrew
7981f90a77
Fix bug where backups would not run due to extraneous character in server init
2022-01-12 01:24:03 -05:00
Andrew
e2f4a33380
Fix bug where servers would not auto start.
2022-01-11 18:30:06 -05:00
Andrew
134a6431b8
Fix waiting start issue
2022-01-11 01:38:14 -05:00
Andrew
73c6c1b871
Fix port reminder
...
Add Server time zone to details
2022-01-10 14:58:38 -05:00
Andrew
3e90210f3b
Remove port checker for a port reminder on first run
...
Add DB column to track a server's first run
Send port reminder for crafty on fresh install.
Remove http server message from startup/logs - don't want to promote that it's running.
2022-01-09 13:14:59 -05:00
Andrew
7dd24b6b15
Improved File Loading, Fixed Port checking
2022-01-08 23:03:45 +00:00
xithical
cf1403a0ee
Added better handling for non UTF-8 characters in output
2021-12-13 20:44:22 -06:00
Andrew
c59b13bfde
Fix port issue
2021-12-09 23:58:35 -05:00
Andrew
bc164fef67
Add timeout to telnet.
2021-12-10 04:52:37 +00:00
Andrew
635f671fd9
Move internet check to start after server has started.
2021-12-09 17:58:36 -05:00
Quentin
12153b1207
Merge branch 'fix/exit-code-tweak' into 'dev'
...
removed old exit handling logic
See merge request crafty-controller/crafty-commander!109
2021-12-06 05:50:48 +00:00
Quentin B
b2dc1521d6
removed old exit handling logic
2021-12-05 23:01:44 -05:00
Andrew
a19ba7dbb6
Backup Restore/Root Disable
2021-11-29 21:22:46 +00:00
Andrew
4c6b459b43
Remove useless if in backups.i
2021-11-27 19:28:53 -05:00
Andrew
bfe6cabd9e
Fix bug where a false EULA on delay start would cause the user to never be able to start the server.
2021-11-27 18:43:14 -05:00
Andrew
c7d3b3aa1c
Fix update notifications.
2021-11-27 18:32:53 -05:00
Andrew
12c4c9ec45
Fix bug where all server terminals would show updating.
2021-11-27 17:46:37 -05:00
Andrew
1bf47b5c54
Rework server start to look for user_id and not user_lang. Gives acces to more user info.
...
Fixes websocket broadcast to only send broadcast to user who sent original request.
2021-11-27 17:10:43 -05:00
Andrew
e21a019de4
Add better logging to falling back to default language on server start.
2021-11-27 12:53:29 -05:00
Andrew
64c4df343a
Fix autostart error with missing param.
...
Takes default lang for errors on auto start since there is no user language to choose from for an auto start error.
2021-11-27 12:01:55 -05:00
Andrew
c811c568a5
Fix Merge issues
2021-11-23 17:16:33 -05:00
Andrew
97ddc1b964
Merge branch 'pretzel-patches' into 'dev'
...
# Conflicts:
# app/classes/shared/server.py
2021-11-23 22:12:06 +00:00
Andrew
dc83dc8fc8
Add EULA confirm message on server startup if EULA is not found.
2021-11-23 16:11:23 -05:00
Silversthorn
f20d41242d
Adding Helpers for Path
...
Correcting a MVC update missing function
2021-11-21 11:52:29 +01:00
computergeek125
62cac66e8e
revert readall change since it didn't work
2021-11-19 19:06:35 -06:00
computergeek125
5230a7ddc3
fix I/O thread read, fixed thread ident/pid
2021-11-19 18:31:33 -06:00
computergeek125
45e074ac4a
Resolved thread leak, fixed non-Minecraft java terminate, renamed
...
threads
2021-11-19 18:14:32 -06:00
Andrew
df398718f1
Fixes bug for backup loops on shutil.
2021-11-19 01:07:53 -05:00
computergeek125
64ec33ff52
Resolved subprocess issues with windows
...
- Repaired introduced bug where backslashes in the far path weren't
handled properly
- Resolved latent subprocess issue where stdout would fail to send
websocket notifications when a a windows \r\n was emitted
2021-11-14 18:17:23 -06:00
computergeek125
9720929e33
Resolved missing stdout when java process exits quickly
2021-11-06 12:06:26 -05:00
computergeek125
82f4661044
Fixed db_helper issue
2021-11-06 11:27:15 -05: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
Andrew
606d0ac74b
Allows translation on start error messages.
2021-09-29 21:53:14 -04:00
Andrew
0ee8418ba5
Merge branch 'db-lang' into 'user-language'
...
Db lang
See merge request crafty-controller/crafty-commander!79
2021-09-29 21:50:17 +00:00
Andrew
acedb0ad8a
Added inital setup for user-based languages.
...
Waiting for DB changes to finish.
2021-09-28 22:25:47 -04:00
Silversthorn
eee9796428
Move out_buf in the try method
2021-09-25 23:08:40 +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
Silversthorn
813ce1c73b
Merge branch 'dev' into dev-Silversthorn
2021-09-21 21:01:40 +02:00
Andrew
6e54089890
Adds delayed start status for auto-launching servers when crafty starts.
2021-09-20 18:30:17 -04:00
Andrew
f032f4054e
Adds inital support for waiting to start. Need to test on more powerful machine.
2021-09-20 14:46:31 -04:00
Andrew
45d2bff57a
Adds translations to start error messages.
2021-09-13 15:37:59 -04:00
Andrew
7316cc7ea0
Adds kill process button to dashboard.
2021-09-13 15:03:47 -04:00
Andrew
2528c123f2
Adds port/internet connection checks.
...
Checks when crafty starts for internet and a port forward for Crafty's https port.
Checks on server launch for internet connection and for port forwarding for executed server.
2021-09-13 13:10:34 -04:00
Silversthorn
1c13c640fc
fixing double server start process
2021-09-09 22:00:52 +02:00
Silversthorn
70ca82a086
Rework architecture for better MVC
2021-09-09 00:01:10 +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
Andrew
90d59faf5b
This is broken right now. Trying to add unzip function
2021-08-19 16:50:18 -04:00
xithical
c20ffb522d
Merge branch 'dev' into 'xithical'
...
# Conflicts:
# app/classes/shared/server.py
2021-08-18 23:30:45 +00:00
Andrew
c1ce2b985a
Fixed bugs from pretzel merge
2021-08-18 12:50:13 -04:00
Andrew
0ab8f11a60
Merge branch 'dev' into 'pretzel'
...
# Conflicts:
# app/classes/shared/server.py
# app/classes/web/panel_handler.py
# main.py
2021-08-18 16:34:41 +00:00
Scott R
689e4abb51
Oops! All backups are gone... but not anymore!
...
While loop automatically removed all old backups greater than the max backups threshold... including if it was set to 0. Set a test for the while loop to make sure max backups is greater than 0 before deletey delete
2021-08-14 00:07:24 -05:00
Scott R
5b8764cb45
Removed extra .zip
...
Unnecessary .zip in backup filename generation in server.py, nuked it
2021-08-14 00:00:09 -05:00
Scott R
096a38ae54
Redoing shutil zip after merging new DB things
...
Merged from Pretzel for DB change things and needed to readd code for shutil for zipping
2021-08-13 23:28:41 -05:00
Andrew
aebf50dfc6
Fixed updates
2021-08-12 00:33:18 -04:00
Andrew
0875734777
Key errors are fixed in this
2021-08-11 23:49:06 -04:00
Andrew
6cc87c6dd1
Cleaned up backups after I broke them.
2021-08-11 23:33:18 -04:00
Andrew
001a8ee9c3
Don't use a while loop to constantly write changes to DB.
2021-08-11 23:14:33 -04:00
luukas
d1f582edfe
Full release on stdout fix!
...
Basically I ditch the ANSI codes and use the old highlighting system.
2021-08-11 23:29:31 +03:00
luukas
4bac56e84a
Use stdout for virtual terminal. WebSockets seem to be "laggy".
2021-08-10 23:17:56 +03:00
Andrew
160e374c7a
Update messages are working, but it's not clean and we should find a better way at some point.
2021-08-07 15:23:22 -04:00
Andrew
e86998e57d
This is the unstable version of pretzel where he breaks things.
2021-08-07 13:15:53 -04:00
Andrew McManus
3d979ffed3
Merge branch 'pretzel_update' into 'pretzel'
...
Added update button and bug fixes
See merge request crafty-controller/crafty-commander!31
2021-07-30 14:59:16 +00:00
Andrew McManus
c2a673dfc3
Added Try Catch around server job spawn. This fixes bug where crafty would not gracefully handle if java did not exist.
2021-07-30 10:30:58 -04:00
Andrew McManus
feab08b36f
Minor changes
2021-07-26 22:22:31 -04:00
Andrew McManus
c3b4b1f213
Minor adjustments to updates
2021-07-26 22:17:37 -04:00
Andrew McManus
f8cda4b748
I don't know the difference between str and int I guess.
2021-07-26 21:49:47 -04:00
Andrew McManus
4e4911e0b5
I don't know how to indent
2021-07-26 21:45:33 -04:00
Andrew McManus
a661d33698
Fixing bugs with updates
2021-07-26 21:39:22 -04:00
Andrew McManus
c8f25b0f9c
Added block to change to updating if user hits dash or term before the update actually starts.
2021-07-26 21:23:56 -04:00
Andrew McManus
67d5723c07
Re-enabled backups for updating jars.
2021-07-26 21:14:36 -04:00
Andrew McManus
a8449cc6f2
Cleanup update code
2021-07-26 21:08:46 -04:00
Andrew McManus
0643a68c74
Adding refresh on dash and term when update finishes to get the status to change. Could not do it dynamically. Buttons would no longer be clickable. Would like to figure that out at some point in the future.
2021-07-26 21:05:52 -04:00
Andrew McManus
a2f32ed324
Another commit because it seems like the first one didn't work. Added seamless hchanging on update status
2021-07-26 18:43:57 -04:00
Andrew McManus
902f7e79bb
Fixed bug where start command checks if the server was updating would fail everytime.
2021-07-26 12:11:46 -04:00
Andrew McManus
979c67d064
Added db setter for stats field (updating) so we can disable start button when server is updating.
2021-07-25 17:04:10 -04:00
Andrew McManus
aaf8438ddb
Added backup to jar update.
2021-07-25 11:49:11 -04:00
Andrew McManus
12db23f6e6
Fixed bug where settings were not reloaded from DB when server is launched
2021-07-25 11:28:09 -04:00
Andrew McManus
3c313fa52f
Fixed bug where backup screen would lock up. Now runs in it's own thread. Fixed backup bug where if a user had a policy of 4 backups, but changed it to 2 then backed up Crafty would only delete the oldest one. No the two oldest.
2021-07-25 11:05:16 -04:00
Andrew McManus
c48fa435fe
Fixed bug where update would not happen once server was shut down if server was running when button was pressed.
2021-07-24 21:32:16 -04:00
Andrew McManus
9cb46a86fb
Added executable updater
2021-07-24 21:09:39 -04:00
luukas
918364d08a
Remove accidental line I added in 736924c8
2021-05-27 21:42:43 +03:00
luukas
736924c839
Fix uptime negative time error by saving it as UTC from the start.
2021-04-18 00:20:23 +03:00
luukas
9049e44803
Fix logging on import errors
2021-04-17 23:34:13 +03:00
computergeek125
02a05b41c9
quickfix stats
2021-03-21 23:48:06 -05:00
computergeek125
506c9bb3c3
Merge branch 'backups-and-stuff' into dev
2021-03-21 23:32:48 -05:00
computergeek125
1d3880207f
Merge branch 'mcmanus-ping-port-patched' into dev
2021-03-21 23:23:27 -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
computergeek125
a0448f5408
Theoretically this fixes tasks scheduler
2021-03-06 14:48:02 -06:00
computergeek125
d2c81eafe0
These are not the typos you're looking for
2021-02-13 06:02:27 +00:00
computergeek125
90465410f8
Forgot to start the process. You saw nothing
2021-02-13 06:00:28 +00:00
computergeek125
7b03dd3da4
forward-port the noshell branch from 3.x
2021-02-13 05:47:30 +00:00
Phillip Tarrant
c154f316b7
Merge branch 'lukas-development' into 'dev'
...
File Manager
See merge request crafty-controller/crafty-commander!19
2021-01-19 12:28:58 +00:00
LukasDoesDev
e3a359bbc6
File Manager: DONE
2021-01-17 19:20:28 +02:00
Phillip Tarrant
6b686c5b47
patches for issue #4 :
...
biggest issue causing the cascade was building crash detection in check_running method
that method is called everywhere, so when called (sometimes 5 times at the same time) it tries to restart the server over and over
i created a new detect_crash method that will now look for crashes and removed all crash detection from check_running method
also added the remove_watcher_thread method to remove the old scheduled task watching the older server.
2020-12-11 09:52:36 -05:00
Phillip Tarrant
10bd7a74c9
fixed issue where server settings don't get reloaded when changing server config without restarting crafty. Now server settings get repulled from DB after writing new settings on config change
2020-10-07 09:19:47 -04:00
Phillip Tarrant
d7fabb3da8
fixed crash detection / auto start checkboxes - found huge issue with crash detection. putting on bug list for later
2020-09-04 14:05:42 -04:00
Phillip Tarrant
d1906751e5
Moved server to shared in prep for plugins
2020-08-31 13:53:46 -04:00
