decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

tasks is default, default response

Browse source
This commit is contained in:
j 2011-02-23 18:32:30 +01:00
parent 1be2e6108a
commit 70c7f92e60
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/init.d/pandora-tasks
View file

@ -19,7 +19,7 @@ PANDORA_BASE=/srv/pandora
DAEMON_USER="pandora" DAEMON_USER="pandora"
DAEMON_NAME=pandora/manage.py DAEMON_NAME=pandora/manage.py
DAEMON="$PANDORA_BASE/$DAEMON_NAME" 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 PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME SCRIPTNAME=/etc/init.d/$NAME

2
pandora/archive/views.py
View file

@ -127,6 +127,7 @@ def upload(request):
} }
} }
''' '''
response = json_response({})
f = get_object_or_404_json(models.File, oshash=request.POST['oshash']) f = get_object_or_404_json(models.File, oshash=request.POST['oshash'])
if 'frame' in request.FILES: if 'frame' in request.FILES:
if f.frames.count() == 0: if f.frames.count() == 0:
@ -136,7 +137,6 @@ def upload(request):
position = float(os.path.splitext(name)[0]) position = float(os.path.splitext(name)[0])
fr, created = models.Frame.objects.get_or_create(file=f, position=position) fr, created = models.Frame.objects.get_or_create(file=f, position=position)
fr.frame.save(name, frame) fr.frame.save(name, frame)
response = json_response({})
else: else:
response = json_response(status=403, text='permissino denied') response = json_response(status=403, text='permissino denied')
if 'file' in request.FILES: if 'file' in request.FILES: