Improved testing (cleaning up afterwards, catching stdout) Refactored import function to it's own file Removed monkey patch to log capturing, but still needs work Translation fixes Removal of several gettext phrases
208 lines
7.1 KiB
Python
208 lines
7.1 KiB
Python
"""
|
|
Provides a function for importing a git repository into the lms
|
|
instance when using a mongo modulestore
|
|
"""
|
|
|
|
import os
|
|
import re
|
|
import StringIO
|
|
import subprocess
|
|
import logging
|
|
|
|
from django.conf import settings
|
|
from django.core import management
|
|
from django.core.management.base import CommandError
|
|
from django.utils import timezone
|
|
from django.utils.translation import ugettext as _
|
|
import mongoengine
|
|
|
|
from dashboard.models import CourseImportLog
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
GIT_REPO_DIR = getattr(settings, 'GIT_REPO_DIR', '/opt/edx/course_repos')
|
|
GIT_IMPORT_STATIC = getattr(settings, 'GIT_IMPORT_STATIC', True)
|
|
|
|
|
|
class GitImportError(Exception):
|
|
"""
|
|
Exception class for handling the typical errors in a git import.
|
|
"""
|
|
|
|
NO_DIR = _("Path {0} doesn't exist, please create it, "
|
|
"or configure a different path with "
|
|
"GIT_REPO_DIR").format(GIT_REPO_DIR)
|
|
URL_BAD = _('Non usable git url provided. Expecting something like:'
|
|
' git@github.com:mitocw/edx4edx_lite.git')
|
|
BAD_REPO = _('Unable to get git log')
|
|
CANNOT_PULL = _('git clone or pull failed!')
|
|
XML_IMPORT_FAILED = _('Unable to run import command.')
|
|
UNSUPPORTED_STORE = _('The underlying module store does not support import.')
|
|
|
|
|
|
def cmd_log(cmd, cwd):
|
|
"""
|
|
Helper function to redirect stderr to stdout and log the command
|
|
used along with the output. Will raise subprocess.CalledProcessError if
|
|
command doesn't return 0, and returns the command's output.
|
|
"""
|
|
output = subprocess.check_output(cmd, cwd=cwd, stderr=subprocess.STDOUT)
|
|
log.debug('Command was: {0!r}. '
|
|
'Working directory was: {1!r}'.format(' '.join(cmd), cwd))
|
|
log.debug('Command output was: {0!r}'.format(output))
|
|
return output
|
|
|
|
|
|
def add_repo(repo, rdir_in):
|
|
"""This will add a git repo into the mongo modulestore"""
|
|
# pylint: disable=R0915
|
|
|
|
# Set defaults even if it isn't defined in settings
|
|
mongo_db = {
|
|
'host': 'localhost',
|
|
'user': '',
|
|
'password': '',
|
|
'db': 'xlog',
|
|
}
|
|
|
|
# Allow overrides
|
|
if hasattr(settings, 'MONGODB_LOG'):
|
|
for config_item in ['host', 'user', 'password', 'db', ]:
|
|
mongo_db[config_item] = settings.MONGODB_LOG.get(
|
|
config_item, mongo_db[config_item])
|
|
|
|
if not os.path.isdir(GIT_REPO_DIR):
|
|
raise GitImportError(GitImportError.NO_DIR)
|
|
# pull from git
|
|
if not (repo.endswith('.git') or
|
|
repo.startswith(('http:', 'https:', 'git:', 'file:'))):
|
|
raise GitImportError(GitImportError.URL_BAD)
|
|
|
|
if rdir_in:
|
|
rdir = os.path.basename(rdir_in)
|
|
else:
|
|
rdir = repo.rsplit('/', 1)[-1].rsplit('.git', 1)[0]
|
|
log.debug('rdir = {0}'.format(rdir))
|
|
|
|
rdirp = '{0}/{1}'.format(GIT_REPO_DIR, rdir)
|
|
if os.path.exists(rdirp):
|
|
log.info('directory already exists, doing a git pull instead '
|
|
'of git clone')
|
|
cmd = ['git', 'pull', ]
|
|
cwd = rdirp
|
|
else:
|
|
cmd = ['git', 'clone', repo, ]
|
|
cwd = GIT_REPO_DIR
|
|
|
|
cwd = os.path.abspath(cwd)
|
|
try:
|
|
ret_git = cmd_log(cmd, cwd=cwd)
|
|
except subprocess.CalledProcessError:
|
|
raise GitImportError(GitImportError.CANNOT_PULL)
|
|
|
|
# get commit id
|
|
cmd = ['git', 'log', '-1', '--format=%H', ]
|
|
try:
|
|
commit_id = cmd_log(cmd, cwd=rdirp)
|
|
except subprocess.CalledProcessError:
|
|
raise GitImportError(GitImportError.BAD_REPO)
|
|
|
|
ret_git += '\nCommit ID: {0}'.format(commit_id)
|
|
|
|
# get branch
|
|
cmd = ['git', 'rev-parse', '--abbrev-ref', 'HEAD', ]
|
|
try:
|
|
branch = cmd_log(cmd, cwd=rdirp)
|
|
except subprocess.CalledProcessError:
|
|
raise GitImportError(GitImportError.BAD_REPO)
|
|
|
|
ret_git += '{0}Branch: {1}'.format(' \n', branch)
|
|
|
|
# Get XML logging logger and capture debug to parse results
|
|
output = StringIO.StringIO()
|
|
import_log_handler = logging.StreamHandler(output)
|
|
import_log_handler.setLevel(logging.DEBUG)
|
|
|
|
logger_names = ['xmodule.modulestore.xml_importer', 'git_add_course',
|
|
'xmodule.modulestore.xml', 'xmodule.seq_module', ]
|
|
loggers = []
|
|
|
|
for logger_name in logger_names:
|
|
logger = logging.getLogger(logger_name)
|
|
logger.setLevel(logging.DEBUG)
|
|
logger.addHandler(import_log_handler)
|
|
loggers.append(logger)
|
|
|
|
try:
|
|
management.call_command('import', GIT_REPO_DIR, rdir,
|
|
nostatic=not GIT_IMPORT_STATIC)
|
|
except CommandError:
|
|
raise GitImportError(GitImportError.XML_IMPORT_FAILED)
|
|
except NotImplementedError:
|
|
raise GitImportError(GitImportError.UNSUPPORTED_STORE)
|
|
|
|
ret_import = output.getvalue()
|
|
|
|
# Remove handler hijacks
|
|
for logger in loggers:
|
|
logger.setLevel(logging.NOTSET)
|
|
logger.removeHandler(import_log_handler)
|
|
|
|
course_id = 'unknown'
|
|
location = 'unknown'
|
|
|
|
# extract course ID from output of import-command-run and make symlink
|
|
# this is needed in order for custom course scripts to work
|
|
match = re.search('(?ms)===> IMPORTING course to location ([^ \n]+)',
|
|
ret_import)
|
|
if match:
|
|
location = match.group(1).strip()
|
|
log.debug('location = {0}'.format(location))
|
|
course_id = location.replace('i4x://', '').replace(
|
|
'/course/', '/').split('\n')[0].strip()
|
|
|
|
cdir = '{0}/{1}'.format(GIT_REPO_DIR, course_id.split('/')[1])
|
|
log.debug('Studio course dir = {0}'.format(cdir))
|
|
|
|
if os.path.exists(cdir) and not os.path.islink(cdir):
|
|
log.debug(' -> exists, but is not symlink')
|
|
log.debug(subprocess.check_output(['ls', '-l', ],
|
|
cwd=os.path.abspath(cdir)))
|
|
try:
|
|
os.rmdir(os.path.abspath(cdir))
|
|
except OSError:
|
|
log.exception('Failed to remove course directory')
|
|
|
|
if not os.path.exists(cdir):
|
|
log.debug(' -> creating symlink between {0} and {1}'.format(rdirp, cdir))
|
|
try:
|
|
os.symlink(os.path.abspath(rdirp), os.path.abspath(cdir))
|
|
except OSError:
|
|
log.exception('Unable to create course symlink')
|
|
log.debug(subprocess.check_output(['ls', '-l', ],
|
|
cwd=os.path.abspath(cdir)))
|
|
|
|
# store import-command-run output in mongo
|
|
mongouri = 'mongodb://{user}:{password}@{host}/{db}'.format(**mongo_db)
|
|
|
|
try:
|
|
if mongo_db['user'] and mongo_db['password']:
|
|
mdb = mongoengine.connect(mongo_db['db'], host=mongouri)
|
|
else:
|
|
mdb = mongoengine.connect(mongo_db['db'], host=mongo_db['host'])
|
|
except mongoengine.connection.ConnectionError:
|
|
log.exception('Unable to connect to mongodb to save log, please '
|
|
'check MONGODB_LOG settings')
|
|
cil = CourseImportLog(
|
|
course_id=course_id,
|
|
location=location,
|
|
repo_dir=rdir,
|
|
created=timezone.now(),
|
|
import_log=ret_import,
|
|
git_log=ret_git,
|
|
)
|
|
cil.save()
|
|
|
|
log.debug('saved CourseImportLog for {0}'.format(cil.course_id))
|
|
mdb.disconnect()
|