From 70c7f92e608aa3a70684de43e0710a64cbe4cd43 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Wed, 23 Feb 2011 18:32:30 +0100 Subject: [PATCH] tasks is default, default response --- etc/init.d/pandora-tasks | 2 +- pandora/archive/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/init.d/pandora-tasks b/etc/init.d/pandora-tasks index 5467b27af..37dc99658 100755 --- a/etc/init.d/pandora-tasks +++ b/etc/init.d/pandora-tasks @@ -19,7 +19,7 @@ PANDORA_BASE=/srv/pandora DAEMON_USER="pandora" DAEMON_NAME=pandora/manage.py DAEMON="$PANDORA_BASE/$DAEMON_NAME" -DAEMON_ARGS="celeryd -Q tasks -n pandora-tasks -f /var/log/pandora/pandora-tasks.log -l INFO" +DAEMON_ARGS="celeryd -Q default -n pandora-tasks -f /var/log/pandora/pandora-tasks.log -l INFO" PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME diff --git a/pandora/archive/views.py b/pandora/archive/views.py index ef3b6facf..7b8259971 100644 --- a/pandora/archive/views.py +++ b/pandora/archive/views.py @@ -127,6 +127,7 @@ def upload(request): } } ''' + response = json_response({}) f = get_object_or_404_json(models.File, oshash=request.POST['oshash']) if 'frame' in request.FILES: if f.frames.count() == 0: @@ -136,7 +137,6 @@ def upload(request): position = float(os.path.splitext(name)[0]) fr, created = models.Frame.objects.get_or_create(file=f, position=position) fr.frame.save(name, frame) - response = json_response({}) else: response = json_response(status=403, text='permissino denied') if 'file' in request.FILES: