bivashy/Blitz-Proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix cli webpanel command bug & Fix webpanel service name in cli

Browse Source
This commit is contained in:
Iam54r1n4
2025-02-07 21:38:31 +00:00
parent f2d8009515
commit 118d08d598
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/cli.py
View File

@ -415,12 +415,12 @@ def webpanel(action: str, domain: str, port: int, admin_username: str, admin_pas
raise click.UsageError('Error: the --domain, --port, --admin-username, and --admin-password are required for the start action.') raise click.UsageError('Error: the --domain, --port, --admin-username, and --admin-password are required for the start action.')
cli_api.start_webpanel(domain, port, admin_username, admin_password, expiration_minutes, debug) cli_api.start_webpanel(domain, port, admin_username, admin_password, expiration_minutes, debug)
services_status = cli_api.get_webpanel_services_status() services_status = cli_api.get_services_status()
if not services_status: if not services_status:
raise click.Abort('Error: WebPanel services status not available.') raise click.Abort('Error: WebPanel services status not available.')
if not services_status.get('webpanel'): if not services_status.get('webpanel'):
raise click.Abort('Error: webpanel.service service is not running.') raise click.Abort('Error: hysteria-webpanel.service service is not running.')
if not services_status.get('caddy'): if not services_status.get('caddy'):
raise click.Abort('Error: caddy.service service is not running.') raise click.Abort('Error: caddy.service service is not running.')
@ -458,7 +458,7 @@ def get_web_panel_services_status():
if services_status := cli_api.get_services_status(): if services_status := cli_api.get_services_status():
webpanel_status = services_status.get('webpanel', False) webpanel_status = services_status.get('webpanel', False)
caddy_status = services_status.get('caddy', False) caddy_status = services_status.get('caddy', False)
print(f"webpanel.service: {'Active' if webpanel_status else 'Inactive'}") print(f"hysteria-webpanel.service: {'Active' if webpanel_status else 'Inactive'}")
print(f"caddy.service: {'Active' if caddy_status else 'Inactive'}") print(f"caddy.service: {'Active' if caddy_status else 'Inactive'}")
else: else:
click.echo('Error: Services status not available.') click.echo('Error: Services status not available.')

2
core/scripts/services_status.sh
View File

@ -2,7 +2,7 @@
declare -a services=( declare -a services=(
"hysteria-server.service" "hysteria-server.service"
"webpanel.service" "hysteria-webpanel.service"
"hysteria-telegram-bot.service" "hysteria-telegram-bot.service"
"hysteria-normal-sub.service" "hysteria-normal-sub.service"
"hysteria-singbox.service" "hysteria-singbox.service"