Merge pull request #784 from AdrMXR/dev

update ngrokConfig
This commit is contained in:
sTiKyt 2020-08-31 16:22:30 +00:00 committed by GitHub
commit 4541f914e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 3 deletions

View File

@ -17,6 +17,9 @@ from Defs.ImportManager.unsorted_will_be_replaced import chmod
from Defs.ImportManager.unsorted_will_be_replaced import DEVNULL from Defs.ImportManager.unsorted_will_be_replaced import DEVNULL
from Defs.ImportManager.unsorted_will_be_replaced import ngrok from Defs.ImportManager.unsorted_will_be_replaced import ngrok
from Defs.ImportManager.unsorted_will_be_replaced import ngrok_conf from Defs.ImportManager.unsorted_will_be_replaced import ngrok_conf
from Defs.ImportManager.unsorted_will_be_replaced import check_process
from Defs.ImportManager.unsorted_will_be_replaced import kill
from Defs.ImportManager.unsorted_will_be_replaced import signal
from Defs.ImportManager.unsorted_will_be_replaced import path from Defs.ImportManager.unsorted_will_be_replaced import path
from Defs.ImportManager.unsorted_will_be_replaced import regular_expression from Defs.ImportManager.unsorted_will_be_replaced import regular_expression
from Defs.ImportManager.unsorted_will_be_replaced import requests from Defs.ImportManager.unsorted_will_be_replaced import requests
@ -128,9 +131,12 @@ def start_localhost(port):
def start_ngrok(port): def start_ngrok(port):
ngrok_conf.PyngrokConfig(config_path=".config/ngrok.yml") #TODO done ngrok_conf.PyngrokConfig(config_path=".config/ngrok.yml")
run_command(["killall", "-2", "ngrok"], stdout=DEVNULL, stderr=DEVNULL)#TODO done pid = check_process("ngrok")
run_command("clear")#TODO done for p in pid:
kill(p, signal.SIGKILL)
# continue
run_command("clear")
print(global_localization.hidden_eye_logo) print(global_localization.hidden_eye_logo)
print(global_localization.official_website_link) print(global_localization.official_website_link)
print(global_localization.by_darksec) print(global_localization.by_darksec)

View File

@ -20,6 +20,7 @@ from os import path
from os import remove from os import remove
from os import replace from os import replace
from os import system from os import system
from os import kill
from pathlib import Path as pathlib_Path from pathlib import Path as pathlib_Path
from shutil import copyfile from shutil import copyfile
from shutil import rmtree from shutil import rmtree
@ -33,7 +34,10 @@ from subprocess import Popen as run_background_command
from time import sleep as wait from time import sleep as wait
from urllib import request as url_request from urllib import request as url_request
from zipfile import ZipFile from zipfile import ZipFile
from pgrep import pgrep as check_process
import requests import requests
import signal
from pyngrok import conf as ngrok_conf from pyngrok import conf as ngrok_conf
from pyngrok import ngrok from pyngrok import ngrok

View File

@ -6,3 +6,5 @@ pyngrok==4.1.10
PyYAML==5.3.1 PyYAML==5.3.1
requests==2.23.0 requests==2.23.0
urllib3==1.25.10 urllib3==1.25.10
pgrep==2020.7.1
kill==2020.7.1