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
