Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/bunkerity/bunkerweb into dev

Browse source
This commit is contained in:
Théophile Diot 2024-02-05 13:53:33 +01:00
commit cbb8ae20a2
No known key found for this signature in database
GPG key ID: 248FEA4BAE400D06
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/ui/main.py
View file

@ -1271,23 +1271,28 @@ def custom_plugin(plugin: str):
# Get USE_<NAME> if exists
# Check if the plugin is used by one service
config = app.config["CONFIG"].get_config(methods=False)
services = app.config["CONFIG"].get_services(with_drafts=True)
use_key = False
is_used = False
for key, value in curr_plugin["settings"].items():
if key.upper().startswith("USE_"):
use_key = key
print("use key :", flush=True)
print(use_key, flush=True)
# Case no USE_<NAME>, it means always show
if not use_key:
is_used = True if config[use_key] == "yes" else False
is_used = True
# Case USE_<NAME>, it means show only if used by one service
if use_key and not is_used:
for service in services:
if service[use_key] == "yes":
is_used = True
break
if curr_plugin["settings"][use_key]["context"] == "global":
is_used = config.get(use_key, "no") == "yes"
else:
for service in config.get("SERVER_NAME", "").split(" "):
if config.get(f"{service}_{use_key}", "no") == "yes":
is_used = True
break
message = ""
if not plugin_id_rx.match(plugin):
@ -1487,6 +1492,7 @@ def logs_linux():
"error"
if "[error]" in log_lower or "[crit]" in log_lower or "[alert]" in log_lower or "❌" in log_lower
else (("warn" if "[warn]" in log_lower or "⚠️" in log_lower else ("info" if "[info]" in log_lower or "ℹ️" in log_lower else "message")))
)
logs.append(

10
src/ui/src/Instances.py
View file

@ -124,8 +124,8 @@ class Instance:
def metrics_redis(self) -> Tuple[bool, dict[str, Any]]:
return self.apiCaller.send_to_apis("GET", "/redis/stats", response=True)
def ping(self, plugin_id, hostname: str = "") -> Tuple[bool, dict[str, Any]]:
return self.apiCaller.send_to_apis("POST", f"/{plugin_id}/ping?host={hostname}", response=True)
def ping(self, plugin_id) -> Tuple[bool, dict[str, Any]]:
return self.apiCaller.send_to_apis("POST", f"/{plugin_id}/ping", response=True)
class Instances:
@ -439,8 +439,12 @@ class Instances:
ping = {"status": "error"}
for instance in self.get_instances():
try:
resp, ping_data = instance.ping(plugin_id, instance["name"])
resp, ping_data = instance.ping(plugin_id)
print("res", flush=True)
print(resp, flush=True)
except:
print("exception", flush=True)
print(format_exc(), flush=True)
continue
if not resp: