mirror of
https://github.com/Ysurac/openmptcprouter-vps-admin.git
synced 2025-03-09 15:40:05 +00:00
Fix V2Ray traffic stats
This commit is contained in:
parent
4d23ca8d90
commit
488cc5346d
2 changed files with 12 additions and 3 deletions
6
debian/changelog
vendored
6
debian/changelog
vendored
|
@ -1,3 +1,9 @@
|
||||||
|
omr-vps-admin (0.3+20230911) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Fix V2Ray traffic stats
|
||||||
|
|
||||||
|
-- OpenMPTCProuter <contact@openmptcprouter.com> Mon, 11 Sep 2023 10:52:57 +0200
|
||||||
|
|
||||||
omr-vps-admin (0.3+20230910) unstable; urgency=medium
|
omr-vps-admin (0.3+20230910) unstable; urgency=medium
|
||||||
|
|
||||||
* Remove dig requirement
|
* Remove dig requirement
|
||||||
|
|
|
@ -132,12 +132,15 @@ def get_bytes_v2ray(t,user):
|
||||||
else:
|
else:
|
||||||
side="uplink"
|
side="uplink"
|
||||||
try:
|
try:
|
||||||
data = subprocess.check_output('/usr/bin/v2ray api stats --server=127.0.0.1:10085 -json ' + "'" + 'user>>>' + user + '>>>traffic>>>' + side + "'" + ' 2>/dev/null | jq -r .stat[0].value | tr -d " "', shell = True)
|
data = subprocess.check_output('/usr/bin/v2ray api stats --server=127.0.0.1:10085 -json ' + "'" + 'user>>>' + user + '>>>traffic>>>' + side + "'" + ' 2>/dev/null | jq -r .stat[0].value | tr -d " " | tr -d "\n"', shell = True)
|
||||||
#data = subprocess.check_output('/usr/bin/v2ctl api --server=127.0.0.1:10085 StatsService.GetStats ' + "'" + 'name: "user>>>' + user + '>>>traffic>>>' + side + '"' + "'" + ' 2>/dev/null | grep value | cut -d: -f2 | tr -d " "', shell = True)
|
#data = subprocess.check_output('/usr/bin/v2ctl api --server=127.0.0.1:10085 StatsService.GetStats ' + "'" + 'name: "user>>>' + user + '>>>traffic>>>' + side + '"' + "'" + ' 2>/dev/null | grep value | cut -d: -f2 | tr -d " "', shell = True)
|
||||||
except:
|
except:
|
||||||
return 0
|
return 0
|
||||||
if data.decode("utf-8") != '':
|
if data.decode("utf-8") != '' and data.decode("utf-8") != 'null':
|
||||||
return int(data.decode("utf-8"))
|
try:
|
||||||
|
return int(data.decode("utf-8"))
|
||||||
|
except ValueError:
|
||||||
|
return 0
|
||||||
else:
|
else:
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue