BioArchLinux/archrepo2
2
0
Fork 0
mirror of https://github.com/lilydjwg/archrepo2.git synced 2025-03-10 12:02:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

multiple addresses in simple-udp notification

Browse source
This commit is contained in:
lilydjwg 2014-10-19 15:33:49 +08:00
parent bc3a890194
commit 2c5b9ccb28
2 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
archrepo.ini.example
View file

@ -42,7 +42,7 @@ wait-time: 3
# Notification type to use when done. Currently available: simple-udp, null # Notification type to use when done. Currently available: simple-udp, null
notification-type: simple-udp notification-type: simple-udp
notification-address: 127.0.0.1:9900 notification-addresses: 127.0.0.1:9900 ::1:9900
notification-secret: JiUHuGY987G76djItfOskOj notification-secret: JiUHuGY987G76djItfOskOj
# If for any reason, you don't want actual database creation or update: # If for any reason, you don't want actual database creation or update:

44
archrepo2/repomon.py
View file

@ -70,7 +70,7 @@ class RepoMan:
notification_type = config.get('notification-type', 'null') notification_type = config.get('notification-type', 'null')
if notification_type != 'null': if notification_type != 'null':
self._notification_addr = config.get('notification-address') self._notification_addrs = config.get('notification-addresses')
self._notification_secret = config.get('notification-secret') self._notification_secret = config.get('notification-secret')
self.send_notification = getattr( self.send_notification = getattr(
self, self,
@ -154,19 +154,26 @@ class RepoMan:
) )
def send_notification_simple_udp(self): def send_notification_simple_udp(self):
address, port = self._parse_notification_address_inet()
try:
af, socktype, proto, canonname, sockaddr = socket.getaddrinfo(
address, port, 0, socket.SOCK_DGRAM, 0, 0)[0]
except:
logger.error('failed to create socket for notification', exc_info=True)
return
sock = socket.socket(af, socktype, proto)
msg = self._new_notification_msg() msg = self._new_notification_msg()
sock.sendto(msg, sockaddr)
sock.close() socks = {}
logger.info('simple udp notification sent.') for address, port in self._parse_notification_address_inet():
try:
af, socktype, proto, canonname, sockaddr = socket.getaddrinfo(
address, port, 0, socket.SOCK_DGRAM, 0, 0)[0]
except:
logger.exception('failed to create socket to %r for notification',
(address, port))
continue
info = af, socktype, proto
if info not in socks:
sock = socket.socket(*info)
socks[info] = sock
else:
sock = socks[info]
sock.sendto(msg, sockaddr)
logger.info('simple udp notification sent to %s.', (address, port))
def _new_notification_msg(self): def _new_notification_msg(self):
s = 'update' s = 'update'
@ -178,11 +185,14 @@ class RepoMan:
return msg.encode('utf-8') return msg.encode('utf-8')
def _parse_notification_address_inet(self): def _parse_notification_address_inet(self):
cached = self._notification_addr cached = self._notification_addrs
if isinstance(cached, str): if isinstance(cached, str):
host, port = cached.rsplit(':', 1) addresses = []
port = int(port) for addr in cached.split():
cached = self._notification_addr = (host, port) host, port = addr.rsplit(':', 1)
port = int(port)
addresses.append((host, port))
cached = self._notification_addrs = tuple(addresses)
return cached return cached
def send_notification_null(self): def send_notification_null(self):