From c146e03cf1de2ea33aa86698897b3e3c8d72cf4b Mon Sep 17 00:00:00 2001 From: flaskfarm Date: Wed, 19 Oct 2022 16:40:29 +0900 Subject: [PATCH] update --- cli/code_encode.py | 2 +- lib/framework/init_main.py | 37 ++- lib/framework/init_menu.py | 3 +- lib/framework/init_route.py | 1 - lib/framework/static/js/ff_common1.js | 8 +- lib/framework/static/js/ff_global1.js | 14 + lib/framework/static/js/ff_ui1.js | 79 +++-- lib/framework/static/js/sjva_ui14.js | 9 +- lib/framework/templates/log.html | 6 +- lib/framework/templates/macro.html | 113 ++++--- lib/framework/templates/macro_menu.html | 2 + lib/framework/version.py | 2 +- lib/plugin/logic.py | 12 + lib/plugin/model_base.py | 71 ++-- lib/plugin/route.py | 2 +- lib/support/base/sub_process.py | 39 ++- lib/system/mod_log.py | 5 + lib/system/mod_tool.py | 16 +- lib/system/page_command.py | 291 ++++++++++++++++ lib/system/setup.py | 1 + lib/system/templates/system_all_log.html | 11 +- lib/system/templates/system_home.html | 52 +-- lib/system/templates/system_plugin_list.html | 40 +-- lib/system/templates/system_setting_auth.html | 9 +- lib/system/templates/system_tool_command.html | 310 ++++++++++++++++++ lib/system/templates/system_tool_python.html | 76 +++++ 26 files changed, 965 insertions(+), 246 deletions(-) create mode 100644 lib/system/page_command.py create mode 100644 lib/system/templates/system_tool_command.html create mode 100644 lib/system/templates/system_tool_python.html diff --git a/cli/code_encode.py b/cli/code_encode.py index 8ab44e5..a9b38de 100644 --- a/cli/code_encode.py +++ b/cli/code_encode.py @@ -43,4 +43,4 @@ class CodeEncode: if __name__== "__main__": CodeEncode().process_args() - # python C:\work\FlaskFarm\flaskfarm\lib\cli\code_encode.py --source=C:\work\FlaskFarm\data\LOADING\klive_plus\source_spotv.py +# python C:\work\FlaskFarm\flaskfarm\cli\code_encode.py --source=C:\work\FlaskFarm\data\LOADING\sjva diff --git a/lib/framework/init_main.py b/lib/framework/init_main.py index f4caa9f..50cb278 100644 --- a/lib/framework/init_main.py +++ b/lib/framework/init_main.py @@ -57,6 +57,7 @@ class Framework: def __initialize(self): + os.environ["PYTHONUNBUFFERED"] = "1" os.environ['FF'] = "true" self.__config_initialize("first") self.__make_default_dir() @@ -118,7 +119,9 @@ class Framework: for package_name in plugins: db_path = os.path.join(self.config['path_data'], 'db', f'{package_name}.db') self.app.config['SQLALCHEMY_BINDS'][package_name] = f'sqlite:///{db_path}' - self.db = SQLAlchemy(self.app, session_options={"autoflush": False}) + self.db = SQLAlchemy(self.app, session_options={"autoflush": False, "expire_on_commit": False}) + #with self.app.app_context(): + # self.db.session.expunge_all() def __init_celery(self): @@ -222,6 +225,7 @@ class Framework: from . import init_route, log_viewer self.__make_default_logger() + self.__config_initialize("last") self.logger.info('### LAST') self.logger.info(f"### PORT: {self.config.get('port')}") self.logger.info('### Now you can access App by webbrowser!!') @@ -266,6 +270,18 @@ class Framework: self.app.config['JSON_AS_ASCII'] = False elif mode == 'system_loading_after': pass + elif mode == 'last': + db_foder = os.path.join(self.config['path_data'], 'db') + for name in os.listdir(db_foder): + if name.endswith('.db'): + db_filepath = os.path.join(db_foder, name) + try: + if os.stat(db_filepath).st_size == 0: + os.remove(db_filepath) + self.logger.debug(f"REMOVE {db_filepath}") + except: + pass + def __init_define(self): @@ -372,7 +388,7 @@ class Framework: ################################################### # 로그 ################################################### - def get_logger(self, name): + def get_logger(self, name, from_command=False): logger = logging.getLogger(name) if not logger.handlers: level = logging.DEBUG @@ -396,25 +412,26 @@ class Framework: except: pass logger.setLevel(level) - file_formatter = logging.Formatter(u'[%(asctime)s|%(levelname)s|%(filename)s:%(lineno)s] %(message)s') def customTime(*args): utc_dt = utc.localize(datetime.utcnow()) my_tz = timezone("Asia/Seoul") converted = utc_dt.astimezone(my_tz) return converted.timetuple() + if from_command == False: + file_formatter = logging.Formatter(u'[%(asctime)s|%(levelname)s|%(filename)s:%(lineno)s] %(message)s') + else: + file_formatter = logging.Formatter(u'[%(asctime)s] %(message)s') + file_formatter.converter = customTime file_max_bytes = 1 * 1024 * 1024 fileHandler = logging.handlers.RotatingFileHandler(filename=os.path.join(self.path_data, 'log', f'{name}.log'), maxBytes=file_max_bytes, backupCount=5, encoding='utf8', delay=True) - streamHandler = logging.StreamHandler() - - # handler에 fommater 세팅 fileHandler.setFormatter(file_formatter) - streamHandler.setFormatter(CustomFormatter()) - - # Handler를 logging에 추가 logger.addHandler(fileHandler) - logger.addHandler(streamHandler) + if from_command == False: + streamHandler = logging.StreamHandler() + streamHandler.setFormatter(CustomFormatter()) + logger.addHandler(streamHandler) return logger diff --git a/lib/framework/init_menu.py b/lib/framework/init_menu.py index 0b2d769..6630820 100644 --- a/lib/framework/init_menu.py +++ b/lib/framework/init_menu.py @@ -1,7 +1,7 @@ import os import shutil -from support import SupportYaml +from support import SupportYaml, d from framework import F @@ -89,4 +89,5 @@ class MenuManager: @classmethod def get_menu_map(cls): + #F.logger.warning(d(cls.menu_map)) return cls.menu_map diff --git a/lib/framework/init_route.py b/lib/framework/init_route.py index 8f3fa59..ac4cf5c 100644 --- a/lib/framework/init_route.py +++ b/lib/framework/init_route.py @@ -128,4 +128,3 @@ def videojs(): def connect(): pass - diff --git a/lib/framework/static/js/ff_common1.js b/lib/framework/static/js/ff_common1.js index 88c6ec3..e043560 100644 --- a/lib/framework/static/js/ff_common1.js +++ b/lib/framework/static/js/ff_common1.js @@ -53,7 +53,7 @@ $.notify({ }, offset: 20, spacing: 10, - z_index: 1031, + z_index: 3000, delay: 10000, timer: 1000, url_target: '_blank', @@ -81,7 +81,7 @@ $.notify({ function notify(msg, type) { - $.notify('' + msg + '', {type: type}); + $.notify('' + msg + '', {type: type, z_index: 3000}); } // 메뉴 제거 @@ -289,8 +289,8 @@ $.extend( { var form = ''; $.each( args, function( key, value ) { - //console.log(key); - //console.log(value); + console.log(key); + console.log(value); value = value.split('"').join('\"') form += ''; }); diff --git a/lib/framework/static/js/ff_global1.js b/lib/framework/static/js/ff_global1.js index d4e766c..e0c5301 100644 --- a/lib/framework/static/js/ff_global1.js +++ b/lib/framework/static/js/ff_global1.js @@ -1,5 +1,6 @@ // global socketio $(document).ready(function(){ + ResizeTextArea(); }); $(document).ready(function(){ @@ -23,6 +24,7 @@ frameSocket.on('notify', function(data){ target: '_self' },{ type: data['type'], + z_index: 2000, }); }); @@ -317,5 +319,17 @@ $("body").on('click', '#command_modal_input_btn', function(e) { }); }); + +$(window).resize(function() { + ResizeTextArea(); +}); + + +function ResizeTextArea() { + ClientHeight = window.innerHeight + $("#command_modal").height(ClientHeight-100); + $("#command_modal_textarea").height(ClientHeight-380); +} + /////////////////////////////////////// diff --git a/lib/framework/static/js/ff_ui1.js b/lib/framework/static/js/ff_ui1.js index ee43e42..f2a0494 100644 --- a/lib/framework/static/js/ff_ui1.js +++ b/lib/framework/static/js/ff_ui1.js @@ -1,4 +1,4 @@ -function m_button_group(h) { +function j_button_group(h) { var str = '
'; str += h str += '
'; @@ -6,7 +6,7 @@ function m_button_group(h) { } // primary, secondary, success, danger, warning, info, light, dark, white -function m_button(id, text, data={}, color='success', outline=true, small=false) { +function j_button(id, text, data={}, color='success', outline=true, small=false) { var str = ' + {% endfor %} + + + {{ setting_bottom(desc) }} +{% endmacro %} + + + + {% macro setting_radio_with_value(id, title, radios, value=None, desc=None, disabled=False) %} {{ setting_top(title) }} @@ -635,62 +694,8 @@ macros.setting_button_with_info([['toggle_btn', 'Toggle', [{'key':'category', 'v -{% macro setting_input_textarea_wide(id, left, value='', col='12', row='3', desc='', disabled=False, padding='10') %} -
-
- {% if left != '' %} -
- {{ left }} -
- {% endif %} -
- -
- {% if desc is not none %} -
- - {% if desc is string %} - {{ desc }} - {% elif desc is iterable %} - {% for d in desc %} - {{ d }}
- {% endfor %} - {% endif %} - -
- {% endif %} -
-
-{% endmacro %} -{% macro setting_input_textarea_and_buttons(id, left, buttons, value='', col='9', row='3', desc='', disabled=False) %} - {{ setting_top(left) }} -
- -
- {% for b in buttons %} - - {% endfor %} -
-
- {{ setting_bottom(desc) }} -{% endmacro %} - diff --git a/lib/framework/templates/macro_menu.html b/lib/framework/templates/macro_menu.html index d21c344..5d407a3 100644 --- a/lib/framework/templates/macro_menu.html +++ b/lib/framework/templates/macro_menu.html @@ -18,6 +18,8 @@ {% for category in menu_map %} {% if 'uri' in category and category['uri'].startswith('http') %}
  • {{category['name']}}
    • + {% elif 'uri' in category and category['uri'].startswith('http') == False %} +
  • {{category['name']}}
    • {% else %}
  • diff --git a/lib/framework/version.py b/lib/framework/version.py index 30a0c33..7e2e1d0 100644 --- a/lib/framework/version.py +++ b/lib/framework/version.py @@ -1 +1 @@ -VERSION="4.0.26" \ No newline at end of file +VERSION="4.0.27" \ No newline at end of file diff --git a/lib/plugin/logic.py b/lib/plugin/logic.py index 92f1019..a1186da 100644 --- a/lib/plugin/logic.py +++ b/lib/plugin/logic.py @@ -241,3 +241,15 @@ class Logic(object): self.P.logger.error(traceback.format_exc()) ret = {'ret' : 'danger', 'msg':str(e)} return ret + + + def arg_to_dict(self, arg): + import urllib.parse + + tmp = urllib.parse.unquote(arg) + tmps = tmp.split('&') + ret = {} + for tmp in tmps: + _ = tmp.split('=') + ret[_[0]] = _[1] + return ret diff --git a/lib/plugin/model_base.py b/lib/plugin/model_base.py index 3dad27f..fadc531 100644 --- a/lib/plugin/model_base.py +++ b/lib/plugin/model_base.py @@ -19,8 +19,10 @@ class ModelBase(F.db.Model): def save(self): try: - F.db.session.add(self) - F.db.session.commit() + with F.app.app_context(): + F.db.session.add(self) + F.db.session.commit() + return self except Exception as e: self.logger.error(f'Exception:{str(e)}') self.logger.error(traceback.format_exc()) @@ -43,55 +45,59 @@ class ModelBase(F.db.Model): paging['next_page'] = False paging['current_page'] = current_page paging['count'] = count - cls.logger.debug('paging : c:%s %s %s %s %s %s', count, paging['total_page'], paging['prev_page'], paging['next_page'] , paging['start_page'], paging['last_page']) + F.logger.debug('paging : c:%s %s %s %s %s %s', count, paging['total_page'], paging['prev_page'], paging['next_page'] , paging['start_page'], paging['last_page']) return paging except Exception as e: - cls.logger.error(f'Exception:{str(e)}') - cls.logger.error(traceback.format_exc()) + F.logger.error(f'Exception:{str(e)}') + F.logger.error(traceback.format_exc()) @classmethod def get_by_id(cls, id): try: - return F.db.session.query(cls).filter_by(id=id).first() + with F.app.app_context(): + return F.db.session.query(cls).filter_by(id=int(id)).first() except Exception as e: - cls.logger.error(f'Exception:{str(e)}') - cls.logger.error(traceback.format_exc()) + F.logger.error(f'Exception:{str(e)}') + F.logger.error(traceback.format_exc()) @classmethod def get_list(cls, by_dict=False): try: - tmp = F.db.session.query(cls).all() - if by_dict: - tmp = [x.as_dict() for x in tmp] - return tmp + with F.app.app_context(): + tmp = F.db.session.query(cls).all() + if by_dict: + tmp = [x.as_dict() for x in tmp] + return tmp except Exception as e: - cls.logger.error(f'Exception:{str(e)}') - cls.logger.error(traceback.format_exc()) + F.logger.error(f'Exception:{str(e)}') + F.logger.error(traceback.format_exc()) @classmethod def delete_by_id(cls, id): try: - F.db.session.query(cls).filter_by(id=id).delete() - F.db.session.commit() - return True + with F.app.app_context(): + F.db.session.query(cls).filter_by(id=int(id)).delete() + F.db.session.commit() + return True except Exception as e: - cls.logger.error(f'Exception:{str(e)}') - cls.logger.error(traceback.format_exc()) + F.logger.error(f'Exception:{str(e)}') + F.logger.error(traceback.format_exc()) return False @classmethod def delete_all(cls): try: - F.db.session.query(cls).delete() - F.db.session.commit() - return True + with F.app.app_context(): + F.db.session.query(cls).delete() + F.db.session.commit() + return True except Exception as e: - cls.logger.error(f'Exception:{str(e)}') - cls.logger.error(traceback.format_exc()) + F.logger.error(f'Exception:{str(e)}') + F.logger.error(traceback.format_exc()) return False @@ -113,7 +119,7 @@ class ModelBase(F.db.Model): query = cls.make_query(order=order, search=search, option1=option1, option2=option2) count = query.count() query = query.limit(page_size).offset((page-1)*page_size) - cls.logger.debug('cls count:%s', count) + F.logger.debug('cls count:%s', count) lists = query.all() ret['list'] = [item.as_dict() for item in lists] ret['paging'] = cls.get_paging_info(count, page, page_size) @@ -121,18 +127,19 @@ class ModelBase(F.db.Model): if cls.model_setting is not None and cls.__tablename__ is not None: cls.model_setting.set(f'{cls.__tablename__}_last_list_option', f'{order}|{page}|{search}|{option1}|{option2}') except Exception as e: - cls.logger.error('Exception:%s', e) - cls.logger.error(traceback.format_exc()) - cls.logger.error(f'{cls.__tablename__}_last_list_option ERROR!' ) + F.logger.error('Exception:%s', e) + F.logger.error(traceback.format_exc()) + F.logger.error(f'{cls.__tablename__}_last_list_option ERROR!' ) return ret except Exception as e: - cls.logger.error('Exception:%s', e) - cls.logger.error(traceback.format_exc()) + F.logger.error('Exception:%s', e) + F.logger.error(traceback.format_exc()) # 오버라이딩 @classmethod def make_query(cls, order='desc', search='', option1='all', option2='all'): - query = F.db.session.query(cls) - return query + with F.app.app_context(): + query = F.db.session.query(cls) + return query \ No newline at end of file diff --git a/lib/plugin/route.py b/lib/plugin/route.py index 25f9857..dde74aa 100644 --- a/lib/plugin/route.py +++ b/lib/plugin/route.py @@ -136,7 +136,7 @@ def default_route(P): @login_required def sub_ajax(module_name, page_name, command): try: - ins_module = P.get_module(module_name) + ins_module = P.logic.get_module(module_name) ins_page = ins_module.get_page(page_name) if ins_page != None: if command == 'scheduler': diff --git a/lib/support/base/sub_process.py b/lib/support/base/sub_process.py index 85c9529..30f146a 100644 --- a/lib/support/base/sub_process.py +++ b/lib/support/base/sub_process.py @@ -90,7 +90,7 @@ class SupportSubprocess(object): instance_list = [] - def __init__(self, command, print_log=False, shell=False, env=None, timeout=None, uid=None, gid=None, stdout_callback=None): + def __init__(self, command, print_log=False, shell=False, env=None, timeout=None, uid=None, gid=None, stdout_callback=None, call_id=None): self.command = command self.print_log = print_log self.shell = shell @@ -101,6 +101,8 @@ class SupportSubprocess(object): self.stdout_callback = stdout_callback self.process = None self.stdout_queue = None + self.call_id = call_id + self.timestamp = time.time() def start(self, join=True): @@ -127,13 +129,14 @@ class SupportSubprocess(object): tmp.append(f'"{x}"') self.command = ' '.join(tmp) + logger.debug(f"{self.command=}") if platform.system() == 'Windows': - self.process = subprocess.Popen(self.command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, shell=self.shell, env=self.env, encoding='utf8') + self.process = subprocess.Popen(self.command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, shell=self.shell, env=self.env, encoding='utf8', bufsize=0) else: if self.uid == None: - self.process = subprocess.Popen(self.command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, shell=self.shell, env=self.env, encoding='utf8') + self.process = subprocess.Popen(self.command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, shell=self.shell, env=self.env, encoding='utf8', bufsize=0) else: - self.process = subprocess.Popen(self.command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, shell=self.shell, env=self.env, preexec_fn=demote(self.uid, self.gid), encoding='utf8') + self.process = subprocess.Popen(self.command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, shell=self.shell, env=self.env, preexec_fn=demote(self.uid, self.gid), encoding='utf8', bufsize=0) SupportSubprocess.instance_list.append(self) self.start_communicate() self.start_send_callback() @@ -207,11 +210,14 @@ class SupportSubprocess(object): else: if self.stdout_callback != None: self.stdout_callback('log', line) + self.remove_instance(self) + th = threading.Thread(target=func, args=()) th.setDaemon(True) th.start() + def process_close(self): try: if self.process is not None and self.process.poll() is None: @@ -228,6 +234,8 @@ class SupportSubprocess(object): #self.stdout_queue = None self.process.kill() except: pass + + self.remove_instance(self) def input_command(self, cmd): if self.process != None: @@ -241,4 +249,25 @@ class SupportSubprocess(object): instance.process_close() cls.instance_list = [] - \ No newline at end of file + + @classmethod + def remove_instance(cls, remove_instance): + new = [] + for instance in cls.instance_list: + if remove_instance.timestamp == instance.timestamp: + continue + new.append(instance) + cls.instance_list = new + + @classmethod + def print(cls): + for instance in cls.instance_list: + logger.info(instance.command) + + + @classmethod + def get_instance_by_call_id(cls, call_id): + for instance in cls.instance_list: + if instance.call_id == call_id: + return instance + \ No newline at end of file diff --git a/lib/system/mod_log.py b/lib/system/mod_log.py index 4d4ec35..334313f 100644 --- a/lib/system/mod_log.py +++ b/lib/system/mod_log.py @@ -23,6 +23,11 @@ class ModuleLog(PluginModuleBase): arg['log_list'] = '|'.join(log_list) arg['all_list'] = '|'.join(log_files) arg['filename'] = 'framework.log' + print(request.form) + print(request.form) + print(request.form) + print(request.form) + if 'filename' in request.form: arg['filename'] = request.form['filename'] return render_template(f'{__package__}_{name}.html', arg=arg) diff --git a/lib/system/mod_tool.py b/lib/system/mod_tool.py index 7a24a16..c836f7f 100644 --- a/lib/system/mod_tool.py +++ b/lib/system/mod_tool.py @@ -1,14 +1,15 @@ from support import SupportFile +from .page_command import PageCommand from .setup import * name = 'tool' class ModuleTool(PluginModuleBase): def __init__(self, P): - super(ModuleTool, self).__init__(P, name=name, first_menu='upload') - self.set_page_list([PageUpload, PageCrypt]) - + super(ModuleTool, self).__init__(P, name=name, first_menu='command') + + self.set_page_list([PageUpload, PageCrypt, PagePython, PageCommand]) @@ -23,8 +24,6 @@ class PageUpload(PluginPageBase): class PageCrypt(PluginPageBase): - - def __init__(self, P, parent): super(PageCrypt, self).__init__(P, parent, name='crypt') @@ -32,4 +31,9 @@ class PageCrypt(PluginPageBase): f'{self.parent.name}_{self.name}_use_user_key': 'False', f'{self.parent.name}_{self.name}_user_key': '', f'{self.parent.name}_{self.name}_user_key': '', - } \ No newline at end of file + } + +class PagePython(PluginPageBase): + def __init__(self, P, parent): + super(PagePython, self).__init__(P, parent, name='python') + diff --git a/lib/system/page_command.py b/lib/system/page_command.py new file mode 100644 index 0000000..dbed9e6 --- /dev/null +++ b/lib/system/page_command.py @@ -0,0 +1,291 @@ +import queue + +from support import SupportSubprocess +from tool import ToolModalCommand + +from .setup import * + + +class PageCommand(PluginPageBase): + + def __init__(self, P, parent): + super(PageCommand, self).__init__(P, parent, name='command') + self.db_default = { + f'{self.parent.name}_{self.name}_recent': '', + } + + def process_menu(self, req): + arg = self.P.ModelSetting.to_dict() + arg['path_data'] = F.config['path_data'] + return render_template(f'{self.P.package_name}_{self.parent.name}_{self.name}.html', arg=arg) + + + + def process_command(self, command, arg1, arg2, arg3, req): + ret = {'ret':'success'} + if command == 'foreground_command': + P.ModelSetting.set(f'{self.parent.name}_{self.name}_recent', arg1) + self.__foreground_execute(arg1, arg1.split(' ')) + + return jsonify('') + elif command == 'job_new': + db_item = ModelCommand.job_new(arg1) + ret['msg'] = f"ID:{db_item.id} 작업을 생성하였습니다." + elif command == 'job_list': + ret['data'] = ModelCommand.job_list() + + elif command == 'job_save': + data = P.logic.arg_to_dict(arg1) + db_item = ModelCommand.get_by_id(data['job_id']) + db_item.set_command(data['job_command']) + db_item.args = data['job_command_args'] + db_item.description = data['job_description'] + db_item.schedule_mode = data['job_schedule_mode'] + db_item.schedule_auto_start = (data.get('job_schedule_auto_start', 'False') == 'True') + db_item.schedule_interval = data.get('job_schedule_interval', '') + db_item.save() + ret['msg'] = '수정하였습니다.' + elif command == 'job_remove': + if ModelCommand.delete_by_id(arg1): + ret['msg'] = '삭제하였습니다.' + else: + ret['ret'] = 'danger' + ret['msg'] = '삭제에 실패하였습니다.' + elif command == 'job_fore_execute': + db_item = ModelCommand.get_by_id(arg1) + cmd = (db_item.command + ' ' + db_item.args).strip() + self.__foreground_execute(f"Command ID: {db_item.id}", cmd.split(' '), db_item.id) + elif command == 'job_back_execute': + self.execute_thread_start(arg1) + ret['msg'] = "실행 요청을 하였습니다.
    로그를 확인하세요." + elif command == 'job_log': + ret['filename'] = f"command_{arg1}.log" + if os.path.exists(os.path.join(F.config['path_data'], 'log', f"command_{arg1}.log")) == False: + ret['ret'] = 'danger' + ret['msg'] = "로그 파일이 없습니다." + elif command == 'task_sched': + job_id = req.form['arg1'] + flag = (req.form['arg2'] == 'true') + scheduler_id = f'command_{job_id}' + if flag and F.scheduler.is_include(scheduler_id): + ret['msg'] = '이미 스케쥴러에 등록되어 있습니다.' + elif flag and F.scheduler.is_include(scheduler_id) == False: + result = self.__sched_add(job_id) + ret['msg'] = '스케쥴러에 추가하였습니다.' + elif flag == False and scheduler.is_include(scheduler_id): + result = scheduler.remove_job(scheduler_id) + ret['msg'] = '스케쥴링 취소' + elif flag == False and scheduler.is_include(scheduler_id) == False: + ret['msg'] = '등록되어 있지 않습니다.' + elif command == 'job_process_stop': + process_ins = SupportSubprocess.get_instance_by_call_id(f"command_{arg1}") + if process_ins == None: + ret['msg'] = "실행중인 Process가 없습니다." + else: + process_ins.process_close() + ret['msg'] = "Process를 중지하였습니다." + return jsonify(ret) + + + def __foreground_execute(self, title, command, job_id=None): + + if command[0] != 'LOAD': + ToolModalCommand.start(title, [command]) + else: + F.socketio.emit("command_modal_show", title, namespace='/framework', broadcast=True) + def start_communicate_load(load_log_list): + def func(): + while True: + logs = load_log_list.getvalue() + load_log_list.truncate(0) + if logs: + P.logger.error(logs) + F.socketio.emit("command_modal_add_text", logs.strip() + '\n', namespace='/framework', broadcast=True) + if logs == '<>': + break + time.sleep(0.3) + th = threading.Thread(target=func) + th.setDaemon(True) + th.start() + + def func(): + import io + from contextlib import redirect_stdout + load_log_list = io.StringIO() + with redirect_stdout(self.load_log_list): + start_communicate_load(load_log_list) + if job_id is not None: + command_logger = get_logger(f'command_{job_id}') + else: + command_logger = P.logger + self.__module_load(command, logger=command_logger) + load_log_list.write("<>") + load_log_list.flush() + th = threading.Thread(target=func, args=()) + th.setDaemon(True) + th.start() + return 'success' + + + def __module_load(self, command, **kwargs): + try: + python_filename = command[1] + python_sys_path = os.path.dirname(python_filename) + if python_sys_path not in sys.path: + sys.path.append(python_sys_path) + module_name = os.path.basename(python_filename).split('.py')[0] + if module_name not in sys.path: + sys.path.append(module_name) + import importlib + mod = importlib.import_module(module_name) + importlib.reload(mod) + args = command + mod_command_load = getattr(mod, 'main') + if mod_command_load: + ret = mod_command_load(*args, **kwargs) + return ret + except Exception as e: + P.logger.error(f'Exception:{str(e)}') + P.logger.error(traceback.format_exc()) + + + + def execute_thread_start(self, job_id): + th = threading.Thread(target=self.execute_thread_function_by_job_id, args=(job_id,)) + th.setDaemon(True) + th.start() + + + def execute_thread_function_by_job_id(self, *args, **kwargs): + P.logger.error(d(args)) + P.logger.error(d(kwargs)) + db_item = ModelCommand.get_by_id(args[0]) + kwargs['id'] = args[0] + self.execute_thread_function((db_item.command + ' ' + db_item.args).strip(), **kwargs) + + + def execute_thread_function(self, command, **kwargs): + try: + cmd = command.split(' ') + + if cmd[0] == 'LOAD': + command_logger = F.get_logger(f"command_{kwargs['id']}") + kwargs['logger'] = command_logger + return self.__module_load(cmd, **kwargs) + else: + class LogReceiver: + def __init__(self, logger): + self.logger = logger + + def stdout_callback(self, mode, text): + if mode == 'log': + self.logger.debug(text) + else: + self.logger.debug(mode) + command_logger = F.get_logger(f"command_{kwargs['id']}", from_command=True) + receiver = LogReceiver(command_logger) + process = SupportSubprocess(cmd, stdout_callback=receiver.stdout_callback, call_id=f"command_{kwargs['id']}") + process.start() + except Exception as e: + P.logger.error(f'Exception:{str(e)}') + P.logger.error(traceback.format_exc()) + + + def plugin_load(self): + def plugin_load_thread(): + try: + db_items = ModelCommand.get_list() + for db_item in db_items: + if db_item.schedule_mode == 'startup': + self.execute_thread_start(db_item.id) + elif db_item.schedule_mode == 'scheduler' and db_item.schedule_auto_start: + self.__sched_add(db_item.id, db_item=db_item) + except Exception as exception: + logger.error('Exception:%s', exception) + logger.error(traceback.format_exc()) + try: + th = threading.Thread(target=plugin_load_thread) + th.setDaemon(True) + th.start() + except Exception as e: + P.logger.error(f'Exception:{str(e)}') + P.logger.error(traceback.format_exc()) + + + def __sched_add(self, id, db_item=None): + try: + if db_item is None: + db_item = ModelCommand.get_by_id(id) + job_id = f"command_{db_item.id}" + if scheduler.is_include(job_id): + return + job = Job(self.P.package_name, job_id, db_item.schedule_interval, self.execute_thread_function_by_job_id, db_item.description, args=db_item.id) + scheduler.add_job_instance(job) + return True + except Exception as e: + P.logger.error(f'Exception:{str(e)}') + P.logger.error(traceback.format_exc()) + return False + + + + + + + + + + +class ModelCommand(ModelBase): + __tablename__ = 'command_job' + __table_args__ = {'mysql_collate': 'utf8_general_ci'} + __bind_key__ = 'system' + + id = db.Column(db.Integer, primary_key=True) + command = db.Column(db.String) + filepath = db.Column(db.String) + args = db.Column(db.String) + description = db.Column(db.String) + schedule_mode = db.Column(db.String) # none, startup, scheduler + schedule_auto_start = db.Column(db.Boolean) # 시작시 스케쥴링 등록 + schedule_interval = db.Column(db.String) # 주기 + + + def __init__(self, command): + self.args = '' + self.description = '' + self.schedule_mode = 'none' + self.schedule_auto_start = False + self.schedule_interval = '' + self.set_command(command) + + def set_command(self, command): + self.command = command + tmp = command.split(' ') + for t in tmp: + for ext in ['.py', '.sh', '.bat']: + if t.endswith(ext): + self.filepath = t + break + + + @classmethod + def job_new(cls, command): + item = ModelCommand(command) + return item.save() + + + @classmethod + def job_list(cls): + try: + data = cls.get_list(by_dict=True) + for item in data: + item['scheduler_is_include'] = F.scheduler.is_include(f"command_{item['id']}") + item['scheduler_is_running'] = F.scheduler.is_running(f"command_{item['id']}") + + item['process'] = (SupportSubprocess.get_instance_by_call_id(f"command_{item['id']}") != None) + + return data + except Exception as exception: + logger.error('Exception:%s', exception) + logger.error(traceback.format_exc()) diff --git a/lib/system/setup.py b/lib/system/setup.py index 07d1182..34fb39d 100644 --- a/lib/system/setup.py +++ b/lib/system/setup.py @@ -29,6 +29,7 @@ __menu = { 'uri': 'tool', 'name': '시스템 툴', 'list': [ + {'uri': 'command', 'name': 'Command'}, {'uri': 'upload', 'name': '업로드'}, {'uri': 'python', 'name': 'Python'}, {'uri': 'db', 'name': 'DB'}, diff --git a/lib/system/templates/system_all_log.html b/lib/system/templates/system_all_log.html index 0d4b9ab..a26b11a 100644 --- a/lib/system/templates/system_all_log.html +++ b/lib/system/templates/system_all_log.html @@ -3,7 +3,7 @@
    {{ macros.setting_select_empty('log_select1', '로그 파일 선택 (.log)') }} - {{ macros.setting_select_empty('log_select2', '로그 파일 선택 (.logX)') }} +
    +
    + {{ macros.m_button_group([['job_save_btn', '저장'], ['job_remove_btn', '삭제'], ['modal_hide_btn', '닫기']])}} +
    + + + + + + +{% endblock %} \ No newline at end of file diff --git a/lib/system/templates/system_tool_python.html b/lib/system/templates/system_tool_python.html new file mode 100644 index 0000000..4d040dc --- /dev/null +++ b/lib/system/templates/system_tool_python.html @@ -0,0 +1,76 @@ +{% extends "base.html" %} +{% block content %} +
    + {{ macros.m_button_group([['globalSettingSaveBtn', '설정 저장']])}} + {{ macros.m_row_start('5') }} + {{ macros.m_row_end() }} + +
    +
    + {{ macros.m_tab_content_start('normal', true) }} + {{ macros.setting_checkbox('tool_crypt_use_user_key', '암호화 키 직접 입력', value=arg['tool_crypt_use_user_key'], desc=['On : 본인 키 사용', '주의) 변경 후 일반설정-인증-로그인 암호를 새로 저장해야 합니다.', 'Off : 앱 고정 키 사용']) }} +
    + {{ macros.setting_input_text('tool_crypt_user_key', '암호화 키', value=arg['tool_crypt_user_key'], desc=['16진수(숫자, a~e)로 이루어진 32글자. 미만시 앞을 0으로 채움. 초과시 뒤에 무시']) }} +
    + + {{ macros.setting_input_text_and_buttons('tool_crypt_encrypt_word', '암호화', [['tool_crypt_encrypt_word_btn', '암호화']], value=arg['tool_crypt_encrypt_word']) }} + {{ macros.setting_input_text('tool_crypt_encrypt_word_result', '', disabled=True) }} + + {{ macros.setting_input_text_and_buttons('tool_crypt_decrypt_word', '평문화', [['tool_crypt_decrypt_word_btn', '평문화']], value=arg['tool_crypt_decrypt_word']) }} + {{ macros.setting_input_text('tool_crypt_decrypt_word_result', '', disabled=True) }} + {{ macros.m_tab_content_end() }} + +
    +
    +
    + + +{% endblock %}