diff --git a/src/covid19/blueprints/admin/admin_service.py b/src/covid19/blueprints/admin/admin_service.py index 04ec713ec8011c71b6060de6598d399b89264552..2ec1710453c2f6b85a36cf7d65e6567e02ef16b3 100644 --- a/src/covid19/blueprints/admin/admin_service.py +++ b/src/covid19/blueprints/admin/admin_service.py @@ -24,13 +24,13 @@ class AdminService: def run_admin_database_dump(self): app.logger.info(" run database dump [begin]") app.logger.info("------------------------------------------------------------") + app.logger.info(os.getcwd()) user = app.config['SQLALCHEMY_DATABASE_USER'] url = app.config['SQLALCHEMY_DATABASE_HOST'] db = app.config['SQLALCHEMY_DATABASE_DB'] - cmd = 'pg_dump -U '+user+' -h '+url+' '+db\ - +' --clean --if-exists --no-tablespaces '\ + cmd = 'pg_dump --if-exists --clean --no-tablespaces '\ +' --on-conflict-do-nothing --rows-per-insert=1000 --column-inserts '\ - +' --quote-all-identifiers --no-privileges > '\ + +' --quote-all-identifiers --no-privileges -U '+user+' -h '+url+' '+db+' > '\ + self.file_path app.logger.info(" start: "+str(cmd)) returncode = self.__run_ome_shell_command(cmd) @@ -48,10 +48,12 @@ class AdminService: result = subprocess.run(args, shell=True, check=True, capture_output=True, encoding='UTF-8') returncode = result.returncode except subprocess.CalledProcessError as error: - app.logger.warning("WARN: AdminService.__run_ome_shell_command") - app.logger.warning("cmd :::" + cmd + ":::") - app.logger.warning("error :::" + str(error) + ":::") - app.logger.warning("WARN: AdminService.__run_ome_shell_command") + app.logger.warning("---------------------------------------------------------") + app.logger.warning(" WARN: AdminService.__run_ome_shell_command") + app.logger.warning("---------------------------------------------------------") + app.logger.warning(" cmd: :::" + cmd + ":::") + app.logger.warning(" erro: :::" + str(error) + ":::") + app.logger.warning("---------------------------------------------------------") return returncode def run_admin_database_dump_reimport(self): @@ -61,8 +63,9 @@ class AdminService: user = app.config['SQLALCHEMY_DATABASE_USER'] url = app.config['SQLALCHEMY_DATABASE_HOST'] db = app.config['SQLALCHEMY_DATABASE_DB'] + one_cmd = 'psql -U ' + user + ' -h ' + url + ' ' + db + ' < ' + self.file_path cmd_list = [ - 'psql -U ' + user + ' -h ' + url + ' ' + db + ' < ' + self.file_path + one_cmd ] for cmd in cmd_list: returncode = self.__run_ome_shell_command(cmd)