Mercurial > p > roundup > code
view detectors/newitemcopy.py @ 6823:fe0091279f50
Refactor session db logging and key generation for sessions/otks
While I was working on the redis sessiondb stuff, I noticed that
log_wanrning, get_logger ... was duplicated. Also there was code to
generate a unique key for otks that was duplicated.
Changes:
creating new sessions_common.py and SessionsCommon class to provide
methods:
log_warning, log_info, log_debug, get_logger, getUniqueKey
getUniqueKey method is closer to the method used to make
session keys in client.py.
sessions_common.py now report when random_.py chooses a weak
random number generator. Removed same from rest.py.
get_logger reconciles all logging under
roundup.hyperdb.backends.<name of BasicDatabase class>
some backends used to log to root logger.
have BasicDatabase in other sessions_*.py modules inherit from
SessionCommon.
change logging to use log_* methods.
In addition:
remove unused imports reported by flake8 and other formatting
changes
modify actions.py, rest.py, templating.py to use getUniqueKey
method.
add tests for new methods
test_redis_session.py
swap out ModuleNotFoundError for ImportError to prevent crash in
python2 when redis is not present.
allow injection of username:password or just password into redis
connection URL. set pytest_redis_pw envirnment variable to password
or user:password when running test.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Sun, 07 Aug 2022 01:51:11 -0400 |
| parents | 23b8e6067f7c |
| children |
line wrap: on
line source
from roundup import hyperdb, roundupdb from roundup.mailer import Mailer def indentChangeNoteValue(text): # copied from roundupdb.IssueClass.indentChangeNoteValue() lines = text.rstrip('\n').split('\n') lines = [ ' '+line for line in lines ] return '\n'.join(lines) def generateCreateNote(db, cl, nodeid): # copied from roundupdb.IssueClass.generateCreateNote() cn = cl.classname props = cl.getprops(protected=0) # list the values m = [] prop_items = sorted(props.items()) for propname, prop in prop_items: value = cl.get(nodeid, propname, None) # skip boring entries if not value: continue if isinstance(prop, hyperdb.Link): link = db.classes[prop.classname] if value: key = link.labelprop(default_to_id=1) if key: value = link.get(value, key) else: value = '' elif isinstance(prop, hyperdb.Multilink): if value is None: value = [] l = [] link = db.classes[prop.classname] key = link.labelprop(default_to_id=1) if key: value = [link.get(entry, key) for entry in value] value.sort() value = ', '.join(value) else: value = str(value) if '\n' in value: value = '\n'+indentChangeNoteValue(value) m.append('%s: %s'%(propname, value)) m.insert(0, '----------') m.insert(0, '') return '\n'.join(m) def newitemcopy(db, cl, nodeid, oldvalues): ''' Copy a message about new items to the dispatcher address. ''' try: create_note = cl.generateCreateNote(nodeid) except AttributeError: create_note = generateCreateNote(db, cl, nodeid) try: dispatcher_email = getattr(db.config, 'DISPATCHER_EMAIL') except AttributeError: return try: msgids = cl.get(nodeid, 'messages') except KeyError: msgids = None if msgids: # send a copy to the dispatcher for msgid in msgids: try: cl.send_message(nodeid, msgid, create_note, [dispatcher_email]) except roundupdb.MessageSendError as message: raise roundupdb.DetectorError(message) else: mailer = Mailer(db.config) subject = 'New %s%s' % (cl.classname, nodeid) mailer.standard_message([dispatcher_email], subject, create_note) def init(db): for classname in db.getclasses(): cl = db.getclass(classname) cl.react('create', newitemcopy)
