holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-12-26 08:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync again with master 0.2

Browse Source
This commit is contained in:
Garret Wassermann 2016-10-29 04:11:41 -04:00
commit 1f1d477a35
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
helpdesk/management/commands/get_email.py
View File

@ -85,7 +85,7 @@ def process_email(quiet=False):
logger = logging.getLogger('django.helpdesk.queue.' + q.slug) logger = logging.getLogger('django.helpdesk.queue.' + q.slug)
if not q.logging_type or q.logging_type == 'none': if not q.logging_type or q.logging_type == 'none':
logging.disable(logging.CRITICAL) #disable all messages logging.disable(logging.CRITICAL) # disable all messages
elif q.logging_type == 'info': elif q.logging_type == 'info':
logger.setLevel(logging.INFO) logger.setLevel(logging.INFO)
elif q.logging_type == 'warn': elif q.logging_type == 'warn':
@ -97,7 +97,7 @@ def process_email(quiet=False):
elif q.logging_type == 'debug': elif q.logging_type == 'debug':
logger.setLevel(logging.DEBUG) logger.setLevel(logging.DEBUG)
if quiet: if quiet:
logger.propagate = False # do not propagate to root logger that would log to console logger.propagate = False # do not propagate to root logger that would log to console
logdir = q.logging_dir or '/var/log/helpdesk/' logdir = q.logging_dir or '/var/log/helpdesk/'
handler = logging.FileHandler(logdir + q.slug + '_get_email.log') handler = logging.FileHandler(logdir + q.slug + '_get_email.log')
logger.addHandler(handler) logger.addHandler(handler)
@ -239,7 +239,7 @@ def process_queue(q, logger):
if ticket: if ticket:
logger.info("Successfully processed message %s, ticket/comment created." % str(m)) logger.info("Successfully processed message %s, ticket/comment created." % str(m))
try: try:
#unlink(m) #delete message file if ticket was successful # unlink(m) #delete message file if ticket was successful
logger.info("Successfully deleted message %s." % str(m)) logger.info("Successfully deleted message %s." % str(m))
except: except:
logger.error("Unable to delete message %s." % str(m)) logger.error("Unable to delete message %s." % str(m))
@ -271,7 +271,7 @@ def decode_mail_headers(string):
if six.PY2: if six.PY2:
return u' '.join([unicode(msg, charset or 'utf-8') for msg, charset in decoded]) return u' '.join([unicode(msg, charset or 'utf-8') for msg, charset in decoded])
elif six.PY3: elif six.PY3:
return u' '.join([str(msg,encoding=charset,errors='replace') if charset else str(msg) for msg, charset in decoded]) return u' '.join([str(msg, encoding=charset, errors='replace') if charset else str(msg) for msg, charset in decoded])
def ticket_from_message(message, queue, logger): def ticket_from_message(message, queue, logger):

1
helpdesk/tests/test_get_email.py
View File

@ -20,6 +20,7 @@ except ImportError:
# Python < 3.3 # Python < 3.3
import mock import mock
class GetEmailTestCase(TestCase): class GetEmailTestCase(TestCase):
''' Test reading emails from a local directory ''' ''' Test reading emails from a local directory '''