diff options
| author | MHSanaei <ho3ein.sanaei@gmail.com> | 2024-03-11 12:46:59 +0300 |
|---|---|---|
| committer | MHSanaei <ho3ein.sanaei@gmail.com> | 2024-03-11 12:46:59 +0300 |
| commit | ac5d8af4f92529de1f048ecef1424b28686ecb39 (patch) | |
| tree | 8962159e74584cbf1f3a88876de423e23bb1a760 /web/html | |
| parent | 01cd7539f91d3dc77114a9387d5b856bdbbdbeda (diff) | |
New - leastload, leastping balancer
Diffstat (limited to 'web/html')
| -rw-r--r-- | web/html/xui/xray.html | 12 | ||||
| -rw-r--r-- | web/html/xui/xray_balancer_modal.html | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html index 5fb04152..54665c27 100644 --- a/web/html/xui/xray.html +++ b/web/html/xui/xray.html @@ -537,6 +537,8 @@ <template slot="strategy" slot-scope="text, balancer, index"> <a-tag style="margin:0;" v-if="balancer.strategy=='random'" color="purple">Random</a-tag> <a-tag style="margin:0;" v-if="balancer.strategy=='roundRobin'" color="green">Round Robin</a-tag> + <a-tag style="margin:0;" v-if="balancer.strategy=='leastload'" color="green">Least Load</a-tag> + <a-tag style="margin:0;" v-if="balancer.strategy=='leastping'" color="green">Least Ping</a-tag> </template> <template slot="selector" slot-scope="text, balancer, index"> <a-tag class="info-large-tag" style="margin:1;" v-for="sel in balancer.selector">[[ sel ]]</a-tag> @@ -1131,7 +1133,7 @@ 'tag': balancer.tag, 'selector': balancer.selector }; - if (balancer.strategy == 'roundRobin') { + if (balancer.strategy === 'roundRobin' || balancer.strategy === 'leastload' || balancer.strategy === 'leastping') { tmpBalancer.strategy = { 'type': balancer.strategy }; @@ -1158,7 +1160,7 @@ 'tag': balancer.tag, 'selector': balancer.selector }; - if (balancer.strategy == 'roundRobin') { + if (balancer.strategy === 'roundRobin' || balancer.strategy === 'leastload' || balancer.strategy === 'leastping') { tmpBalancer.strategy = { 'type': balancer.strategy }; @@ -1474,11 +1476,11 @@ if (this.templateSettings != null && this.templateSettings.routing != null && this.templateSettings.routing.balancers != null) { this.templateSettings.routing.balancers.forEach((o, index) => { let strategy = "random" - if (o.strategy && o.strategy.type == "roundRobin") { - strategy = o.strategy.type + if (o.strategy && (o.strategy.type == "roundRobin" || o.strategy.type == "leastload" || o.strategy.type == "leastping")) { + strategy = o.strategy.type; } - data.push({ + data.push({ 'key': index, 'tag': o.tag ? o.tag : "", 'strategy': strategy, diff --git a/web/html/xui/xray_balancer_modal.html b/web/html/xui/xray_balancer_modal.html index 6784de4c..d4d93111 100644 --- a/web/html/xui/xray_balancer_modal.html +++ b/web/html/xui/xray_balancer_modal.html @@ -21,6 +21,8 @@ <a-select v-model="balancerModal.balancer.strategy" :dropdown-class-name="themeSwitcher.currentTheme"> <a-select-option value="random">Random</a-select-option> <a-select-option value="roundRobin">Round Robin</a-select-option> + <a-select-option value="leastload">Least Load</a-select-option> + <a-select-option value="leastping">Least Ping</a-select-option> </a-select> </a-form-item> <a-form-item label='{{ i18n "pages.xray.balancer.balancerSelectors" }}' has-feedback |