ff_plugins/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
soju6jan
2022-10-03 12:48:49 +09:00
parent d8bd8bbf58
commit 9c36ab1368
1 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/framework/init_main.py
View File

@@ -192,16 +192,7 @@ class Framework:
def __prepare_starting(self): def __prepare_starting(self):
# 여기서 monkey.patch시 너무 늦다고 문제 발생 # 여기서 monkey.patch시 너무 늦다고 문제 발생
if self.config['run_flask'] and self.config.get('use_celery') == True: pass
try:
from gevent import monkey
#from gevent import monkey;monkey.patch_all()
#print('[MAIN] gevent mokey patch!!')
#sys.getfilesystemencoding = lambda: 'UTF-8'
except:
self.config['use_celery'] = False
print('[MAIN] gevent not installed!!')
################################################### ###################################################
@@ -220,17 +211,11 @@ class Framework:
self.config['path_app'] = self.config['path_app'][0].upper() + self.config['path_app'][1:] self.config['path_app'] = self.config['path_app'][0].upper() + self.config['path_app'][1:]
self.path_app_root = self.config['path_app'] self.path_app_root = self.config['path_app']
self.config['path_working'] = os.getcwd() self.config['path_working'] = os.getcwd()
print('aaaaaaaaaaaaaaa')
print(os.environ.get('RUNNING_TYPE'))
print(sys.argv)
if os.environ.get('RUNNING_TYPE') == 'docker': if os.environ.get('RUNNING_TYPE') == 'docker':
self.config['running_type'] = 'docker' self.config['running_type'] = 'docker'
self.__process_args() self.__process_args()
self.__load_config() self.__load_config()
self.__init_define() self.__init_define()
elif mode == "flask": elif mode == "flask":
self.app.secret_key = os.urandom(24) self.app.secret_key = os.urandom(24)
#self.app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///data/db/system.db?check_same_thread=False' #self.app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///data/db/system.db?check_same_thread=False'
@@ -299,14 +284,6 @@ class Framework:
os.path.join(self.path_app_root, 'files', 'config.yaml.template'), os.path.join(self.path_app_root, 'files', 'config.yaml.template'),
self.config['config_filepath'] self.config['config_filepath']
) )
print((self.config))
print(self.config['config_filepath'])
#os.environ['FLASK_FARM_CONFIG_FILEPATH'] = self.config['config_filepath']
#else:
# self.config['config_filepath'] = os.environ['FLASK_FARM_CONFIG_FILEPATH']
# self.logger.info(f"CELERY config : {self.config['config_filepath']}")
data = read_yaml(self.config['config_filepath']) data = read_yaml(self.config['config_filepath'])
for key, value in data.items(): for key, value in data.items():
if key == 'running_type' and value not in ['termux', 'entware']: if key == 'running_type' and value not in ['termux', 'entware']: