Refresh patches
Sophie Brun
5 years ago
| 15 | 15 | +# from utils import dependencies |
| 16 | 16 | from utils.user_input import query_yes_no |
| 17 | 17 | from faraday import FARADAY_BASE |
| 18 | except ImportError as ex: | |
| 19 | @@ -32,31 +32,31 @@ def setup_environment(check_deps=False): | |
| 18 | from alembic.script import ScriptDirectory | |
| 19 | @@ -35,31 +35,31 @@ def setup_environment(check_deps=False): | |
| 20 | 20 | # Configuration files generation |
| 21 | 21 | server.config.copy_default_config_to_local() |
| 22 | 22 | |
| 68 | 68 | # Web configuration file generation |
| 69 | 69 | server.config.gen_web_config() |
| 70 | 70 | |
| 71 | @@ -132,7 +132,7 @@ def main(): | |
| 71 | @@ -152,7 +152,7 @@ def main(): | |
| 72 | 72 | parser.add_argument('--start', action='store_true', help='run Faraday Server in background') |
| 73 | 73 | parser.add_argument('--stop', action='store_true', help='stop Faraday Server') |
| 74 | 74 | parser.add_argument('--restart', action='store_true', help='Restart Faraday Server') |
| 77 | 77 | parser.add_argument('--no-setup', action='store_true', help=argparse.SUPPRESS) |
| 78 | 78 | parser.add_argument('--port', help='Overides server.ini port configuration') |
| 79 | 79 | parser.add_argument('--websocket_port', help='Overides server.ini websocket port configuration') |
| 80 | @@ -185,7 +185,7 @@ def main(): | |
| 80 | @@ -205,7 +205,7 @@ def main(): | |
| 81 | 81 | server.config.ssl.enabled = 'true' |
| 82 | 82 | |
| 83 | 83 | if not args.no_setup: |
| 88 | 88 | server.config.faraday_server.port = args.port |
| 89 | 89 | --- a/faraday.py |
| 90 | 90 | +++ b/faraday.py |
| 91 | @@ -29,7 +29,7 @@ from config.globals import ( | |
| 91 | @@ -29,7 +29,7 @@ from config.constant import ( | |
| 92 | 92 | CONST_REQUIREMENTS_FILE, |
| 93 | 93 | CONST_FARADAY_FOLDER_LIST, |
| 94 | 94 | ) |
| 246 | 246 | |
| 247 | 247 | --- a/manage.py |
| 248 | 248 | +++ b/manage.py |
| 249 | @@ -111,9 +111,9 @@ def sql_shell(): | |
| 249 | @@ -114,9 +114,9 @@ def sql_shell(): | |
| 250 | 250 | @click.command(help='Checks configuration and faraday status.') |
| 251 | 251 | @click.option('--check_postgresql', default=False, is_flag=True) |
| 252 | 252 | @click.option('--check_faraday', default=False, is_flag=True) |
| 258 | 258 | |
| 259 | 259 | selected = False |
| 260 | 260 | exit_code = 0 |
| 261 | @@ -127,9 +127,9 @@ def status_check(check_postgresql, check | |
| 261 | @@ -130,9 +130,9 @@ def status_check(check_postgresql, check | |
| 262 | 262 | status_check_functions.print_faraday_status() |
| 263 | 263 | selected = True |
| 264 | 264 | |
| 282 | 282 | from requests.exceptions import InvalidURL, ConnectionError |
| 283 | 283 | from colorama import Fore, Back, Style |
| 284 | 284 | from server.utils.daemonize import is_server_running |
| 285 | @@ -106,37 +106,37 @@ def check_client(): | |
| 285 | @@ -116,37 +116,37 @@ def check_client(): | |
| 286 | 286 | return False |
| 287 | 287 | |
| 288 | 288 | |
| 351 | 351 | |
| 352 | 352 | |
| 353 | 353 | def check_credentials(): |
| 354 | @@ -229,35 +229,35 @@ def print_faraday_status(): | |
| 354 | @@ -248,35 +248,35 @@ def print_faraday_status(): | |
| 355 | 355 | .format(yellow=Fore.YELLOW, white=Fore.WHITE)) |
| 356 | 356 | |
| 357 | 357 | |
| 415 | 415 | |
| 416 | 416 | def print_config_status(): |
| 417 | 417 | """Prints Status of the configuration using check_credentials(), check_storage_permission() and check_open_ports()""" |
| 418 | @@ -297,8 +297,8 @@ def full_status_check(): | |
| 418 | @@ -316,8 +316,8 @@ def full_status_check(): | |
| 419 | 419 | print('\n{white}Checking if Faraday is running...'.format(white=Fore.WHITE)) |
| 420 | 420 | print_faraday_status() |
| 421 | 421 | |