paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-20 14:38:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to logging module instead of syslog.

Browse Source 
(imported from commit 4c2c2f0f23e2688ce916d33d0cf513e386dca70c)
This commit is contained in:
Luke Faraone
2013-07-13 22:34:40 -04:00
parent 4843303267
commit ebde5ab341
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
servers/puppet/modules/humbug/files/zulip-ec2-configure-interfaces
View File

@@ -20,7 +20,8 @@ interfaces.
''' '''
import sys import sys
import syslog import logging
import logging.handlers
import subprocess import subprocess
import re import re
@@ -33,22 +34,26 @@ def address_of(device_id):
except KeyError: except KeyError:
return None return None
syslog.openlog(logoption=syslog.LOG_PID)
syslog.syslog("ec2ify starting")
def guess_gateway(device_id): def guess_gateway(device_id):
# This will not work if the default gateway isn't n.n.n.1. # This will not work if the default gateway isn't n.n.n.1.
address = address_of(device_id).split('.') address = address_of(device_id).split('.')
address[3] = '1' address[3] = '1'
return '.'.join(address) return '.'.join(address)
log = logging.getLogger('ec2ify')
log.setLevel(logging.DEBUG)
log.addHandler(logging.handlers.SysLogHandler(facility=logging.handlers.SysLogHandler.LOG_DAEMON))
log.addHandler(logging.StreamHandler())
log.info("ec2ify starting")
macs = boto.utils.get_instance_metadata()["network"]["interfaces"]["macs"] macs = boto.utils.get_instance_metadata()["network"]["interfaces"]["macs"]
ids = [int(macdata['device-number']) for macdata in macs.values()] ids = [int(macdata['device-number']) for macdata in macs.values()]
ifaces = [iface for iface in netifaces.interfaces() if ":" not in iface and iface != "lo"] ifaces = [iface for iface in netifaces.interfaces() if ":" not in iface and iface != "lo"]
# Number of IDs should equal number of interfaces # Number of IDs should equal number of interfaces
if len(ids) != len(ifaces): if len(ids) != len(ifaces):
syslog.syslog(syslog.LOG_ERR, "Metadata indicated %i interfaces but we have %i!" % (len(ids), len(ifaces))) log.error("Metadata indicated %i interfaces but we have %i!" % (len(ids), len(ifaces)))
sys.exit(1) sys.exit(1)
for device in macs.values(): for device in macs.values():
@@ -65,7 +70,7 @@ for device in macs.values():
if address_of(device_number) is None: if address_of(device_number) is None:
# If the device was not autoconfigured, do so now. # If the device was not autoconfigured, do so now.
syslog.syslog(syslog.LOG_INFO, "Device eth%i not configured, starting dhcpd" % device_number) log.info("Device eth%i not configured, starting dhcpd" % device_number)
subprocess.check_call(['/sbin/dhcpcd', 'eth%i' % device_number]) subprocess.check_call(['/sbin/dhcpcd', 'eth%i' % device_number])
# Horrible hack to route return packets on the correct interface # Horrible hack to route return packets on the correct interface
@@ -85,5 +90,5 @@ for device in macs.values():
for (count, ip) in enumerate(to_configure): for (count, ip) in enumerate(to_configure):
# Configure the IP via a virtual interface # Configure the IP via a virtual interface
device = "eth%i:%i" % (device_number, count) device = "eth%i:%i" % (device_number, count)
syslog.syslog(syslog.LOG_INFO, "Configuring %s with IP %s" % (device, ip)) log.info("Configuring %s with IP %s" % (device, ip))
subprocess.check_call(['/sbin/ifconfig', device, ip]) subprocess.check_call(['/sbin/ifconfig', device, ip])