Merge pull request #1284 from erfjab/mainserverusage

Feat(users): add master server usage ratio

.env.example

@@ -87,6 +87,9 @@ UVICORN_PORT = 8000
 ## Whitelist of IPs/hosts to disable login notifications
 # LOGIN_WHITE_LIST = '1.1.1.1,sub.domain.com,127.0.0.1'
 
+## Main Server Usege Ratio
+# MAIN_SERVER_USAGE_RATIO = 1
+
 ### for developers
 # DOCS=True
 # DEBUG=True

app/jobs/record_usages.py

@@ -12,7 +12,8 @@
 from app.db.models import NodeUsage, NodeUserUsage, System, User
 from config import (DISABLE_RECORDING_NODE_USAGE,
                     JOB_RECORD_NODE_USAGES_INTERVAL,
-                    JOB_RECORD_USER_USAGES_INTERVAL)
+                    JOB_RECORD_USER_USAGES_INTERVAL,
+                    MASTER_SERVER_USAGE_RATIO)
 from xray_api import XRay as XRayAPI
 from xray_api import exc as xray_exc
 
@@ -125,7 +126,7 @@ def get_outbounds_stats(api: XRayAPI):
 
 def record_user_usages():
     api_instances = {None: xray.api}
-    usage_coefficient = {None: 1}  # default usage coefficient for the main api instance
+    usage_coefficient = {None: MASTER_SERVER_USAGE_RATIO}  # default usage coefficient for the main api instance
 
     for node_id, node in list(xray.nodes.items()):
         if node.connected and node.started:

config.py

@@ -66,6 +66,7 @@
 
 EXTERNAL_CONFIG = config("EXTERNAL_CONFIG", default="", cast=str)
 LOGIN_WHITE_LIST = [ip.strip() for ip in config("LOGIN_WHITE_LIST", default="", cast=str).split(",") if ip.strip()]
+MASTER_SERVER_USAGE_RATIO = config("MASTER_SERVER_USAGE_RATIO", default=1, cast=float)
 
 USE_CUSTOM_JSON_DEFAULT = config("USE_CUSTOM_JSON_DEFAULT", default=False, cast=bool)
 USE_CUSTOM_JSON_FOR_V2RAYN = config("USE_CUSTOM_JSON_FOR_V2RAYN", default=False, cast=bool)