rule opt
This commit is contained in:
@@ -268,14 +268,6 @@ def _build_thin_groups(client_type: str, app_config: AppConfig, client: ClientCo
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
groups.append(manual)
|
groups.append(manual)
|
||||||
groups.extend(
|
|
||||||
_build_custom_policy_groups(
|
|
||||||
app_config=app_config,
|
|
||||||
client=client,
|
|
||||||
source_auto_names=source_auto_names,
|
|
||||||
selector_names=selector_names,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
groups.append(
|
groups.append(
|
||||||
{
|
{
|
||||||
"name": client.main_policy,
|
"name": client.main_policy,
|
||||||
@@ -289,6 +281,14 @@ def _build_thin_groups(client_type: str, app_config: AppConfig, client: ClientCo
|
|||||||
],
|
],
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
groups.extend(
|
||||||
|
_build_custom_policy_groups(
|
||||||
|
app_config=app_config,
|
||||||
|
client=client,
|
||||||
|
source_auto_names=source_auto_names,
|
||||||
|
selector_names=selector_names,
|
||||||
|
)
|
||||||
|
)
|
||||||
for region in app_config.regions.values():
|
for region in app_config.regions.values():
|
||||||
group = {
|
group = {
|
||||||
"name": region.name,
|
"name": region.name,
|
||||||
@@ -380,14 +380,6 @@ def _build_bundle_groups(
|
|||||||
"proxies": [*all_proxy_names, client.direct_policy] if all_proxy_names else [client.direct_policy],
|
"proxies": [*all_proxy_names, client.direct_policy] if all_proxy_names else [client.direct_policy],
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
groups.extend(
|
|
||||||
_build_custom_policy_groups(
|
|
||||||
app_config=app_config,
|
|
||||||
client=client,
|
|
||||||
source_auto_names=source_auto_names,
|
|
||||||
selector_names=selector_names,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
groups.append(
|
groups.append(
|
||||||
{
|
{
|
||||||
"name": client.main_policy,
|
"name": client.main_policy,
|
||||||
@@ -401,6 +393,14 @@ def _build_bundle_groups(
|
|||||||
],
|
],
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
groups.extend(
|
||||||
|
_build_custom_policy_groups(
|
||||||
|
app_config=app_config,
|
||||||
|
client=client,
|
||||||
|
source_auto_names=source_auto_names,
|
||||||
|
selector_names=selector_names,
|
||||||
|
)
|
||||||
|
)
|
||||||
for region in app_config.regions.values():
|
for region in app_config.regions.values():
|
||||||
matched = [name for name in all_proxy_names if re.search(region.filter, name)]
|
matched = [name for name in all_proxy_names if re.search(region.filter, name)]
|
||||||
groups.append(
|
groups.append(
|
||||||
|
|||||||
Reference in New Issue
Block a user