implement and document GVAFileException

This commit is contained in:
Jan Dittberner 2014-12-25 21:20:16 +01:00
parent b2acae7dda
commit ea278eeb35
4 changed files with 26 additions and 2 deletions

View file

@ -29,6 +29,12 @@ The project module :py:mod:`gvafile`
.. automodule:: gvafile.urls .. automodule:: gvafile.urls
:py:mod:`gvafile.exceptions`
----------------------------
.. automodule:: gvafile.exceptions
:py:mod:`gvafile.wsgi` :py:mod:`gvafile.wsgi`
---------------------- ----------------------

View file

@ -14,6 +14,7 @@
import sys import sys
import os import os
import django
# If extensions (or modules to document with autodoc) are in another directory, # If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the # add these directories to sys.path here. If the directory is relative to the
@ -22,6 +23,10 @@ sys.path.insert(0, os.path.abspath(os.path.join('..', 'gvafile')))
os.environ['GVAFILE_ALLOWED_HOSTS'] = 'localhost' os.environ['GVAFILE_ALLOWED_HOSTS'] = 'localhost'
os.environ['GVAFILE_SERVER_EMAIL'] = 'root@localhost' os.environ['GVAFILE_SERVER_EMAIL'] = 'root@localhost'
os.environ['GVAFILE_SFTP_DIRECTORY'] = '/home/www'
os.environ['GVAFILE_MAIL_DIRECTORY'] = '/home/mail'
django.setup()
# -- General configuration ----------------------------------------------------- # -- General configuration -----------------------------------------------------

View file

@ -0,0 +1,12 @@
"""
This module defines exceptions for gvafile.
"""
from __future__ import unicode_literals
class GVAFileException(Exception):
"""
Generic Exception class for gvafile.
"""

View file

@ -13,7 +13,8 @@ from django.conf import settings
from celery import shared_task from celery import shared_task
from celery.utils.log import get_task_logger from celery.utils.log import get_task_logger
from celery.exceptions import Reject
from gvafile.exceptions import GVAFileException
_logger = get_task_logger(__name__) _logger = get_task_logger(__name__)
@ -60,7 +61,7 @@ def setup_file_sftp_userdir(username):
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
_logger.exception( _logger.exception(
'could not create SFTP directory for user %s', username) 'could not create SFTP directory for user %s', username)
raise Exception( raise GVAFileException(
"could not create SFTP directory for user %s" % username) "could not create SFTP directory for user %s" % username)
return sftp_directory return sftp_directory