Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265102
Change subject: ganglia: util.py: bunch of pep8 fixes
......................................................................
ganglia: util.py: bunch of pep8 fixes
Change-Id: Ife48d53415fba7b5b3f2fa5ab0a6b8db8798c608
---
M modules/ganglia/files/plugins/util.py
1 file changed, 76 insertions(+), 68 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/02/265102/1
diff --git a/modules/ganglia/files/plugins/util.py
b/modules/ganglia/files/plugins/util.py
index 935b189..964f2cf 100644
--- a/modules/ganglia/files/plugins/util.py
+++ b/modules/ganglia/files/plugins/util.py
@@ -1,31 +1,37 @@
# util.py
# utility functions shared by udpmcast and htcpseqcheck
-import sys, os, signal, socket
+import os
+import signal
+import socket
+import sys
# Globals
debugging = False
+
def debug(msg):
global debugging
-
+
if debugging:
print >> sys.stderr, "DEBUG:", msg
-
+
+
def open_htcp_socket(host="", portnr=4827):
# Open the UDP socket
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
sock.bind((host, portnr))
-
+
return sock
+
def join_multicast_group(sock, multicast_group):
import struct
ip_mreq = struct.pack('!4sl', socket.inet_aton(multicast_group),
- socket.INADDR_ANY)
+ socket.INADDR_ANY)
sock.setsockopt(socket.IPPROTO_IP,
socket.IP_ADD_MEMBERSHIP,
ip_mreq)
@@ -33,83 +39,85 @@
# We do not want to see our own messages back
sock.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_LOOP, 0)
+
def set_multicast_ttl(sock, ttl):
# Set the multicast TTL if requested
sock.setsockopt(socket.IPPROTO_IP,
socket.IP_MULTICAST_TTL,
- ttl)
+ ttl)
def createDaemon():
- """
- Detach a process from the controlling terminal and run it in the
- background as a daemon.
- """
+ """
+ Detach a process from the controlling terminal and run it in the
+ background as a daemon.
+ """
- try:
- # Fork a child process so the parent can exit. This will return control
- # to the command line or shell. This is required so that the new process
- # is guaranteed not to be a process group leader. We have this guarantee
- # because the process GID of the parent is inherited by the child, but
- # the child gets a new PID, making it impossible for its PID to equal its
- # PGID.
- pid = os.fork()
- except OSError, e:
- return((e.errno, e.strerror)) # ERROR (return a tuple)
+ try:
+ # Fork a child process so the parent can exit. This will return
+ # control to the command line or shell. This is required so that the
+ # new process is guaranteed not to be a process group leader. We have
+ # this guarantee because the process GID of the parent is inherited by
+ # the child, but the child gets a new PID, making it impossible for its
+ # PID to equal its PGID.
+ pid = os.fork()
+ except OSError, e:
+ return((e.errno, e.strerror)) # ERROR (return a tuple)
- if (pid == 0): # The first child.
+ if (pid == 0): # The first child.
- # Next we call os.setsid() to become the session leader of this new
- # session. The process also becomes the process group leader of the
- # new process group. Since a controlling terminal is associated with a
- # session, and this new session has not yet acquired a controlling
- # terminal our process now has no controlling terminal. This shouldn't
- # fail, since we're guaranteed that the child is not a process group
- # leader.
- os.setsid()
+ # Next we call os.setsid() to become the session leader of this new
+ # session. The process also becomes the process group leader of the
+ # new process group. Since a controlling terminal is associated with a
+ # session, and this new session has not yet acquired a controlling
+ # terminal our process now has no controlling terminal. This shouldn't
+ # fail, since we're guaranteed that the child is not a process group
+ # leader.
+ os.setsid()
- # When the first child terminates, all processes in the second child
- # are sent a SIGHUP, so it's ignored.
- signal.signal(signal.SIGHUP, signal.SIG_IGN)
+ # When the first child terminates, all processes in the second child
+ # are sent a SIGHUP, so it's ignored.
+ signal.signal(signal.SIGHUP, signal.SIG_IGN)
- try:
- # Fork a second child to prevent zombies. Since the first child is
- # a session leader without a controlling terminal, it's possible for
- # it to acquire one by opening a terminal in the future. This second
- # fork guarantees that the child is no longer a session leader, thus
- # preventing the daemon from ever acquiring a controlling terminal.
- pid = os.fork() # Fork a second child.
- except OSError, e:
- return((e.errno, e.strerror)) # ERROR (return a tuple)
+ try:
+ # Fork a second child to prevent zombies. Since the first child is
+ # a session leader without a controlling terminal, it's possible
+ # for it to acquire one by opening a terminal in the future. This
+ # second fork guarantees that the child is no longer a session
+ # leader, thus preventing the daemon from ever acquiring a
+ # controlling terminal.
+ pid = os.fork() # Fork a second child.
+ except OSError, e:
+ return((e.errno, e.strerror)) # ERROR (return a tuple)
- if (pid == 0): # The second child.
- # Ensure that the daemon doesn't keep any directory in use. Failure
- # to do this could make a filesystem unmountable.
- os.chdir("/")
- # Give the child complete control over permissions.
- os.umask(0)
- else:
- os._exit(0) # Exit parent (the first child) of the second child.
- else:
- os._exit(0) # Exit parent of the first child.
+ if (pid == 0): # The second child.
+ # Ensure that the daemon doesn't keep any directory in use. Failure
+ # to do this could make a filesystem unmountable.
+ os.chdir("/")
+ # Give the child complete control over permissions.
+ os.umask(0)
+ else:
+ os._exit(0) # Exit parent (the first child) of the second child.
+ else:
+ os._exit(0) # Exit parent of the first child.
- # Close all open files. Try the system configuration variable, SC_OPEN_MAX,
- # for the maximum number of open files to close. If it doesn't exist, use
- # the default value (configurable).
- try:
- maxfd = os.sysconf("SC_OPEN_MAX")
- except (AttributeError, ValueError):
- maxfd = 256 # default maximum
+ # Close all open files. Try the system configuration variable,
+ # SC_OPEN_MAX, for the maximum number of open files to close. If it doesn't
+ # exist, use the default value (configurable).
+ try:
+ maxfd = os.sysconf("SC_OPEN_MAX")
+ except (AttributeError, ValueError):
+ maxfd = 256 # default maximum
- for fd in range(0, maxfd):
- try:
- os.close(fd)
- except OSError: # ERROR (ignore)
- pass
+ for fd in range(0, maxfd):
+ try:
+ os.close(fd)
+ except OSError: # ERROR (ignore)
+ pass
- # Redirect the standard file descriptors to /dev/null.
- os.open("/dev/null", os.O_RDONLY) # standard input (0)
- os.open("/dev/null", os.O_RDWR) # standard output (1)
- os.open("/dev/null", os.O_RDWR) # standard error (2)
+ # Redirect the standard file descriptors to /dev/null.
+ os.open("/dev/null", os.O_RDONLY) # standard input (0)
+ os.open("/dev/null", os.O_RDWR) # standard output (1)
+ os.open("/dev/null", os.O_RDWR) # standard error (2)
- return(0)
+ return(0)
--
To view, visit https://gerrit.wikimedia.org/r/265102
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife48d53415fba7b5b3f2fa5ab0a6b8db8798c608
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
