Merge branch 'ygg' into disable-ipfilter

This commit is contained in:
d47081 2023-12-24 07:06:51 +02:00 committed by GitHub
commit 94498e96c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions

View File

@ -9,8 +9,9 @@ User=master
Group=master
WorkingDirectory=/home/master/pymaster/
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
[Install]
WantedBy=multi-user.target

View File

@ -67,7 +67,11 @@ class PyMaster:
self.serverRL = IPRateLimit('server', 60, 30)
self.clientRL = IPRateLimit('client', 60, 120)
# 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))
log("Welcome to PyMaster!")