diff --git a/core/tasks.py b/core/tasks.py deleted file mode 100755 index 89a37e2..0000000 --- a/core/tasks.py +++ /dev/null @@ -1,53 +0,0 @@ -import shutil -from celery.task import task -import os -from core.utils.cdn import upload_to_azure -from spa.signals import waveform_generated_signal - -try: - from django.contrib.gis.geoip import GeoIP -except ImportError: - pass - -from core.utils.waveform import generate_waveform -from dss import settings - - -@task(time_limit=3600) -def create_waveform_task(in_file, uid): - out_file = os.path.join(settings.MEDIA_ROOT, 'waveforms/%s.png' % uid) - print "Creating waveform \n\tIn: %s\n\tOut: %s" % (in_file, out_file) - generate_waveform(in_file, out_file) - if os.path.isfile(out_file): - print "Waveform generated successfully" - out_file, extension = os.path.splitext(in_file) - new_file = os.path.join(settings.MEDIA_ROOT, "mixes", "%s%s" % (uid, extension)) - print "Moving cache audio clip from %s to %s" % (in_file, new_file) - shutil.move(in_file, new_file) - print "Uid: %s" % uid - waveform_generated_signal.send(sender=None, uid=uid) - return new_file - else: - print "Outfile is missing" - - -@task(time_limit=3600) -def archive_mix_task(in_file, filetype, uid): - print "Sending {0} to azure".format(uid) - try: - upload_to_azure(in_file, filetype, uid) - except Exception, ex: - print "Unable to upload: %s".format(ex.message) - -@task -def update_geo_info_task(ip_address, profile_id): - try: - ip = '188.141.70.110' if ip_address == '127.0.0.1' else ip_address - if ip: - g = GeoIP() - city = g.city(ip) - country = g.country(ip) - print "Updated user location" - except Exception, e: - print e.message - pass diff --git a/run_celery.sh b/run_celery.sh index a2e8345..7199e4d 100755 --- a/run_celery.sh +++ b/run_celery.sh @@ -1,4 +1,4 @@ #!/bin/sh -su -m djworker -c "celery worker -A dss.celeryconf -Q default" +su -m djworker -c "sleep 3 && celery worker -A dss.celeryconf -Q default" chown djworker /files -R chown djworker /tmp/dss.log \ No newline at end of file