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

Fixed bugs from pretzel merge

Browse Source
This commit is contained in:
Andrew 2021-08-18 12:50:13 -04:00
parent 85a118da81
commit c1ce2b985a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/classes/shared/server.py
View File

@ -30,8 +30,10 @@ except ModuleNotFoundError as e:
console.critical("Import Error: Unable to load {} module".format(e.name)) console.critical("Import Error: Unable to load {} module".format(e.name))
sys.exit(1) sys.exit(1)
class ServerOutBuf: class ServerOutBuf:
lines = {} lines = {}
def __init__(self, p, server_id): def __init__(self, p, server_id):
self.p = p self.p = p
self.server_id = str(server_id) self.server_id = str(server_id)
@ -180,7 +182,6 @@ class Server:
logger.info("Linux Detected") logger.info("Linux Detected")
logger.info("Starting server in {p} with command: {c}".format(p=self.server_path, c=self.server_command)) logger.info("Starting server in {p} with command: {c}".format(p=self.server_path, c=self.server_command))
<<<<<<< app/classes/shared/server.py
try: try:
self.process = pexpect.spawn(self.server_command, cwd=self.server_path, timeout=None, encoding=None) self.process = pexpect.spawn(self.server_command, cwd=self.server_path, timeout=None, encoding=None)
except Exception as ex: except Exception as ex:
@ -192,15 +193,13 @@ class Server:
return False return False
websocket_helper.broadcast('send_start_reload', { websocket_helper.broadcast('send_start_reload', {
}) })
=======
self.process = pexpect.spawn(self.server_command, cwd=self.server_path, timeout=None, encoding='utf-8') self.process = pexpect.spawn(self.server_command, cwd=self.server_path, timeout=None, encoding='utf-8')
out_buf = ServerOutBuf(self.process, self.server_id) out_buf = ServerOutBuf(self.process, self.server_id)
logger.debug('Starting virtual terminal listener for server {}'.format(self.name)) logger.debug('Starting virtual terminal listener for server {}'.format(self.name))
threading.Thread(target=out_buf.check, daemon=True, name='{}_virtual_terminal'.format(self.server_id)).start() threading.Thread(target=out_buf.check, daemon=True, name='{}_virtual_terminal'.format(self.server_id)).start()
>>>>>>> app/classes/shared/server.py
self.is_crashed = False self.is_crashed = False
self.start_time = str(datetime.datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S')) self.start_time = str(datetime.datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S'))

2
main.py
View File

@ -131,7 +131,7 @@ if __name__ == '__main__':
# this should always be last # this should always be last
tasks_manager.start_main_kill_switch_watcher() tasks_manager.start_main_kill_switch_watcher()
Crafty = MainPrompt(tasks_manager) Crafty = MainPrompt(tasks_manager, migration_manager)
def sigterm_handler(signum, current_stack_frame): def sigterm_handler(signum, current_stack_frame):
print() # for newline print() # for newline