Merge latest bugfixes and improvements from master to docker #29
Conversation
…t-vanilla-server-hibernation.py
renamed variables added more in depth visualization of data usage (in function printDataUsage) added logger replaced _thread with threading module more understandable program layout build message feature to better interface with the clients
removed FindPattern function since it works only for some specific player name cases (of lenght 9) renamed variables added logger more easily readable program layout removed not useful functions
renamed variables added more in depth visualization of data usage (in function printDataUsage) added logger replaced _thread with threading module more understandable program layout build message feature to better interface with the clients
improvements on the buildMessage function
now the script can respond when the client asks for info and ping (func buildMessage and answerPingReq) added data for server icon moved setServerStatusOnline and updateTimeleft in startMinecraftServer (as py version) func answerPingReq: new func buildMessage is now enhanced for both cases: txt and info func forwardSync: added "use of closed network connection" error handling func forwardSync: when debug is active and server is online, the script automatically recognize serverVersion and serverProtocol func handleClientSocket: not executed as a thread but as a normal function bug: moved net.Listen outside of the for loop in main bug: correct typo in timeLeftUntilUp
moved logging.basicConfig in py specific section func handleClientSocket: not executed as a thread but as a normal function func buildMessage: renamed messageJson to messageJSON func answerPingReq: renamed res to req
|
Well, shit. |
ok completely agree... (i'm not really sure what to do for the screen command in the master, i would like to keep it in the master files for easy use of users but at the same time it's a pain for me to remember to replace it every time... plus the systemctl it's kinda cleaner ;)... but when i'll add an external json file for the config it will be simpler i guess right?) |
maybe you can resolve it with the GitHub Desktop app... i'm not sure but it's worth the time to check here |
|
Finished pull request by manually adopting changes in a different commit and finalizing pull request via merging master into docker following the git instructions: |
This will take some time since a lot has to be resolved manually and cannot simply be taken over from master.
The peculiarities of the docker branch shall be documented in a README in the root of the docker branch.
The go version has priority, as the python docker version is not yet finished anyway.
READMEs should not be taken from master, as they are not for display on github, but for the description on dockerhub.
The script will continue to use screen instead of systemctl since setting that up in a docker does not have any major benefits over screen and just introduces complexity.