mirror of
https://github.com/Ysurac/openmptcprouter-vps-admin.git
synced 2025-03-09 15:40:05 +00:00
This commit is contained in:
parent
f368d654a0
commit
d0a6c9d760
2 changed files with 10 additions and 6 deletions
6
debian/changelog
vendored
6
debian/changelog
vendored
|
@ -1,3 +1,9 @@
|
||||||
|
omr-vps-admin (0.6+20231105) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Really fix ss_go stats issue by returning a json instead of 0
|
||||||
|
|
||||||
|
-- OpenMPTCProuter <contact@openmptcprouter.com> Sun, 05 Nov 2023 07:34:25 +0200
|
||||||
|
|
||||||
omr-vps-admin (0.6+20231104) unstable; urgency=medium
|
omr-vps-admin (0.6+20231104) unstable; urgency=medium
|
||||||
|
|
||||||
* Should fix ss_go stats issue
|
* Should fix ss_go stats issue
|
||||||
|
|
10
omr-admin.py
10
omr-admin.py
|
@ -132,10 +132,10 @@ def get_bytes_ss_go(user):
|
||||||
r = requests.get(url="http://127.0.0.1:65279/v1/servers/ss-2022/users/" + user)
|
r = requests.get(url="http://127.0.0.1:65279/v1/servers/ss-2022/users/" + user)
|
||||||
except requests.exceptions.Timeout:
|
except requests.exceptions.Timeout:
|
||||||
LOG.debug("Shadowsocks go stats timeout")
|
LOG.debug("Shadowsocks go stats timeout")
|
||||||
return 0
|
return { 'downlinkBytes': 0, 'uplinkBytes': 0 }
|
||||||
except requests.exceptions.RequestException as err:
|
except requests.exceptions.RequestException as err:
|
||||||
LOG.debug("Shadowsocks go stats error (" + str(err) + ")")
|
LOG.debug("Shadowsocks go stats error (" + str(err) + ")")
|
||||||
return 0
|
return { 'downlinkBytes': 0, 'uplinkBytes': 0 }
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
def get_bytes_v2ray(t,user):
|
def get_bytes_v2ray(t,user):
|
||||||
|
@ -1711,10 +1711,8 @@ async def config(userid: Optional[int] = Query(None), serial: Optional[str] = Qu
|
||||||
else:
|
else:
|
||||||
shadowsocks_go_conf = omr_config_data['users'][0][username]['shadowsocks-go']
|
shadowsocks_go_conf = omr_config_data['users'][0][username]['shadowsocks-go']
|
||||||
ss_go_txrx = get_bytes_ss_go(username)
|
ss_go_txrx = get_bytes_ss_go(username)
|
||||||
if 'downlinkBytes' in ss_go_txrx:
|
ss_go_tx = int(ss_go_txrx['downlinkBytes'])
|
||||||
ss_go_tx = int(ss_go_txrx['downlinkBytes'])
|
ss_go_rx = int(ss_go_txrx['uplinkBytes'])
|
||||||
if 'uplinkBytes' in ss_go_txrx:
|
|
||||||
ss_go_rx = int(ss_go_txrx['uplinkBytes'])
|
|
||||||
|
|
||||||
LOG.debug('Get config... mptcp')
|
LOG.debug('Get config... mptcp')
|
||||||
mptcp_version = mptcp_enabled = mptcp_checksum = '0'
|
mptcp_version = mptcp_enabled = mptcp_checksum = '0'
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue