ndwarshuis
/
pyledriver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add some clarifying remarks

This commit is contained in:
petrucci4prez 2017-05-29 21:53:08 -04:00
parent 6475ce178c
commit 82cfa64527
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
notifier.py
View File

@ -29,6 +29,7 @@ def scheduleAction(action):
time.sleep(sleepTime.days * 86400 + sleepTime.seconds) time.sleep(sleepTime.days * 86400 + sleepTime.seconds)
action() action()
# probably an easier way to do this in logging module
@async(daemon=False) @async(daemon=False)
def sendEmail(subject, body): def sendEmail(subject, body):
msg = MIMEMultipart() msg = MIMEMultipart()

14
sharedLogging.py
View File

@ -3,13 +3,14 @@ from subprocess import run, PIPE, CalledProcessError
from logging.handlers import TimedRotatingFileHandler from logging.handlers import TimedRotatingFileHandler
# formats console output depending on whether we have gluster # formats console output depending on whether we have gluster
def _formatConsole(rotatingFile=False): def _formatConsole(gluster = False):
c = '' if rotatingFile else '[CONSOLE ONLY] ' c = '' if gluster else '[CONSOLE ONLY] '
fmt = logging.Formatter('[%(name)s] [%(levelname)s] ' + c + '%(message)s') fmt = logging.Formatter('[%(name)s] [%(levelname)s] ' + c + '%(message)s')
console.setFormatter(fmt) console.setFormatter(fmt)
# init console, but don't expect gluster to be here yet
console = logging.StreamHandler() console = logging.StreamHandler()
_formatConsole(False) _formatConsole(gluster = False)
rootLogger = logging.getLogger() rootLogger = logging.getLogger()
rootLogger.setLevel(logging.DEBUG) rootLogger.setLevel(logging.DEBUG)
@ -71,6 +72,7 @@ class GlusterFSHandler(TimedRotatingFileHandler):
TimedRotatingFileHandler.close(self) # must close file stream before unmounting TimedRotatingFileHandler.close(self) # must close file stream before unmounting
self._unmount() self._unmount()
# ...now activate gluster
gluster = GlusterFSHandler( gluster = GlusterFSHandler(
server = '192.168.11.39', server = '192.168.11.39',
volume = 'pyledriver', volume = 'pyledriver',
@ -78,10 +80,10 @@ gluster = GlusterFSHandler(
options = 'backupvolfile-server=192.168.11.48' options = 'backupvolfile-server=192.168.11.48'
) )
_formatConsole(True) _formatConsole(gluster = True)
rootLogger.addHandler(gluster) rootLogger.addHandler(gluster)
# this should only be called at the end to clean up
def unmountGluster(): def unmountGluster():
rootLogger.removeHandler(gluster) rootLogger.removeHandler(gluster)
_formatConsole(False) _formatConsole(gluster = False)