mirror of
https://github.com/YGGverse/pymaster.git
synced 2025-09-07 11:32:24 +00:00
Merge branch 'ygg' into disable-ipfilter
This commit is contained in:
commit
94498e96c6
@ -9,8 +9,9 @@ User=master
|
|||||||
Group=master
|
Group=master
|
||||||
WorkingDirectory=/home/master/pymaster/
|
WorkingDirectory=/home/master/pymaster/
|
||||||
ExecStart=/home/master/pymaster/pymaster.py -i $PYMASTER_IP -p $PYMASTER_PORT
|
ExecStart=/home/master/pymaster/pymaster.py -i $PYMASTER_IP -p $PYMASTER_PORT
|
||||||
|
StandardOutput=file:/home/master/pymaster-debug.log
|
||||||
|
StandardError=file:/home/master/pymaster-error.log
|
||||||
Restart=on-failure
|
Restart=on-failure
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
|
||||||
|
@ -67,7 +67,11 @@ class PyMaster:
|
|||||||
self.serverRL = IPRateLimit('server', 60, 30)
|
self.serverRL = IPRateLimit('server', 60, 30)
|
||||||
self.clientRL = IPRateLimit('client', 60, 120)
|
self.clientRL = IPRateLimit('client', 60, 120)
|
||||||
# self.ipfilterRL = IPRateLimit('filterlog', 60, 10)
|
# self.ipfilterRL = IPRateLimit('filterlog', 60, 10)
|
||||||
self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
|
self.ipfilterRL = IPRateLimit('filterlog', 60, 10)
|
||||||
|
if ':' in ip:
|
||||||
|
self.sock = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
|
||||||
|
else:
|
||||||
|
self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
|
||||||
self.sock.bind((ip, port))
|
self.sock.bind((ip, port))
|
||||||
|
|
||||||
log("Welcome to PyMaster!")
|
log("Welcome to PyMaster!")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user