fix(remnawave): не удалять встроенный шаблон подписки
Панель отвечает 400 Reserved template cannot be deleted, из-за этого sync падал на core-net. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
99ee815213
commit
d34c80f9e9
1 file changed
+13
-2
@@ -323,8 +323,19 @@ class Sync:
|
||||
continue
|
||||
if _key(obj, fields) in keep or not obj.get("uuid"):
|
||||
continue
|
||||
self.api.request(step["delete"]["method"], _fill(step["delete"]["path"], obj))
|
||||
self.changes.append(f"deleted {step['id']} {obj.get(fields[0])}")
|
||||
code, data = self.api.request(
|
||||
step["delete"]["method"], _fill(step["delete"]["path"], obj), allow_error=True
|
||||
)
|
||||
if 200 <= code < 300:
|
||||
self.changes.append(f"deleted {step['id']} {obj.get(fields[0])}")
|
||||
continue
|
||||
text = data if isinstance(data, str) else json.dumps(data, ensure_ascii=False)
|
||||
if code == 400 and "Reserved template cannot be deleted" in text:
|
||||
self.warnings.append(f"kept reserved {step['id']} {obj.get(fields[0])}")
|
||||
continue
|
||||
raise RuntimeError(
|
||||
f"Remnawave API DELETE {_fill(step['delete']['path'], obj)} failed (HTTP {code}): {_redact_text(text)}"
|
||||
)
|
||||
|
||||
def load_json_file(self, item: dict[str, Any], _existing: dict[str, Any] | None) -> dict[str, Any]:
|
||||
item["templateJson"] = json.loads(self.files[item["file"]])
|
||||
|
||||
Reference in new issue
Block a user