diff options
author | Michael Elkins <melkins@tislabs.com> | 2010-10-28 22:49:58 +0000 |
---|---|---|
committer | Michael Elkins <melkins@tislabs.com> | 2010-10-28 22:49:58 +0000 |
commit | 2578e9ec1c9f650bdd7f87e90f1f0c6ac71bbc6d (patch) | |
tree | ce42de0876bd793f64ea39cc79f2dfff4069c20f /portal-gui/rpkigui/myrpki/views.py | |
parent | 27675178bf01051eba5351ac8a17abc6c095026b (diff) |
don't run configure_resources when the user is a front-end for rpkidemo
svn path=/portal-gui/rpkigui/myrpki/glue.py; revision=3506
Diffstat (limited to 'portal-gui/rpkigui/myrpki/views.py')
-rw-r--r-- | portal-gui/rpkigui/myrpki/views.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/portal-gui/rpkigui/myrpki/views.py b/portal-gui/rpkigui/myrpki/views.py index dca9b2e6..731e7d56 100644 --- a/portal-gui/rpkigui/myrpki/views.py +++ b/portal-gui/rpkigui/myrpki/views.py @@ -29,6 +29,7 @@ from django.db import IntegrityError from django import http from django.views.generic.list_detail import object_list from django.views.decorators.csrf import csrf_exempt +from django.conf import settings from rpkigui.myrpki import models, forms, glue, misc, AllocationTree from rpkigui.myrpki.asnset import asnset @@ -541,11 +542,16 @@ def upload_myrpki_xml(request, self_handle): parent_handle = get_parent_handle(conf) if request.method == 'POST': - myrpki_xml = open('%s/%s/myrpki.xml' % (settings.MYRPKI_DATA_DIR, self_handle,), 'w') - myrpki_xml.write(request.raw_post_data) - myrpki_xml.close() - - glue.invoke_rpki(parent_handle, [ 'configure_daemons', myrpki_xml.name ]) + try: + fname = '%s/%s/myrpki.xml' % (settings.MYRPKI_DATA_DIR, self_handle,) + print >>sys.stderr, 'writing ', fname + myrpki_xml = open(fname, 'w') + myrpki_xml.write(request.raw_post_data) + myrpki_xml.close() + + glue.invoke_rpki(parent_handle, [ 'configure_daemons', myrpki_xml.name ]) + except: + print >>sys.stderr, ''.join(sys.exc_info()) return serve_file(self_handle, 'myrpki.xml', 'application/xml') |