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

Correction of undefined db_helper following merge

Browse Source
This commit is contained in:
Silversthorn 2021-09-25 23:05:49 +02:00
parent e381ebe239
commit 05ced7610e
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/classes/minecraft/stats.py
View File

@ -201,7 +201,7 @@ class Stats:
for s in servers: for s in servers:
server_id = s.get('server_id', None) server_id = s.get('server_id', None)
server = db_helper.get_server_data_by_id(server_id) server = servers_helper.get_server_data_by_id(server_id)
logger.debug('Getting stats for server: {}'.format(server_id)) logger.debug('Getting stats for server: {}'.format(server_id))

2
app/classes/shared/main_controller.py
View File

@ -101,7 +101,7 @@ class Controller:
self.servers_list.append(temp_server_dict) self.servers_list.append(temp_server_dict)
if s['auto_start']: if s['auto_start']:
db_helper.set_waiting_start(s['server_id'], True) self.servers.set_waiting_start(s['server_id'], True)
self.refresh_server_settings(s['server_id']) self.refresh_server_settings(s['server_id'])

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

@ -185,7 +185,7 @@ class Server:
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))
db_helper.set_waiting_start(self.server_id, False) servers_helper.set_waiting_start(self.server_id, False)
try: try:
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')
except Exception as ex: except Exception as ex:
@ -196,7 +196,7 @@ class Server:
}) })
return False return False
if helper.check_internet(): if helper.check_internet():
loc_server_port = db_helper.get_server_stats_by_id(self.server_id)['server_port'] loc_server_port = servers_helper.get_server_stats_by_id(self.server_id)['server_port']
if helper.check_port(loc_server_port): if helper.check_port(loc_server_port):
websocket_helper.broadcast('send_start_reload', { websocket_helper.broadcast('send_start_reload', {
}) })

6
app/classes/web/ajax_handler.py
View File

@ -58,7 +58,7 @@ class AjaxHandler(BaseHandler):
server_id = bleach.clean(server_id) server_id = bleach.clean(server_id)
server_data = ser.get_server_data_by_id(server_id) server_data = self.controller.servers.get_server_data_by_id(server_id)
if not server_data: if not server_data:
logger.warning("Server Data not found in server_log ajax call") logger.warning("Server Data not found in server_log ajax call")
self.redirect("/panel/error?error=Server ID Not Found") self.redirect("/panel/error?error=Server ID Not Found")
@ -154,7 +154,7 @@ class AjaxHandler(BaseHandler):
if srv_obj.check_running(): if srv_obj.check_running():
srv_obj.send_command(command) srv_obj.send_command(command)
db_helper.add_to_audit_log(user_data['user_id'], "Sent command to {} terminal: {}".format(db_helper.get_server_friendly_name(server_id), command), server_id, self.get_remote_ip()) self.controller.management.add_to_audit_log(user_data['user_id'], "Sent command to {} terminal: {}".format(self.controller.servers.get_server_friendly_name(server_id), command), server_id, self.get_remote_ip())
elif page == "create_file": elif page == "create_file":
file_parent = self.get_body_argument('file_parent', default=None, strip=True) file_parent = self.get_body_argument('file_parent', default=None, strip=True)
@ -208,7 +208,7 @@ class AjaxHandler(BaseHandler):
except Exception as e: except Exception as e:
logger.error("Could not find PID for requested termsig. Full error: {}".format(e)) logger.error("Could not find PID for requested termsig. Full error: {}".format(e))
else: else:
logger.error("Could not find PID for requested termsig. Full error: {}".format(e)) logger.error("Could not find PID for requested termsig. Full error: svr.get_pid() = FALSE")
return return
@tornado.web.authenticated @tornado.web.authenticated