radarsys Commit - r346:f3a35356b00a · Jicamarca Repository

Version con fecha de campanhas corregida pero falta lanzar las tareas e celery rev2

gonzalesluisfrancisco -

r346:f3a35356b00a

parent child

Context file:

r346:f3a35356b00a

Collapse all files

dump.rdb created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

apps/abs/models.py +3 -1

                             try:
                                 data, address = sock.recvfrom(1024)
                                 print (address, data)
+                                data = data.decode("utf-8")
                                 if data == '1':
                                     status[int(address[0][10:])-1] = '3'
+                                    #print (int(address[0][10:])-1)
                                 elif data == '0':
                                     status[int(address[0][10:])-1] = '1'
                             except socket.timeout:
                     print('Inicia intento de salvar device.status')
                     self.device.status = 3
                     self.module_status = ''.join(status)
+                    #print(status)
                     self.save()
                     print('Estatus salvado')
                     conf_active, __ = ABSActive.objects.get_or_create(pk=1)

apps/abs/tasks.py +5 -2

             from datetime import timedelta, datetime
             from celery.task import task
+            from celery.utils.log import get_task_logger
+            logger = get_task_logger(__name__)
             @task(name='task_change_beam')
             def task_change_beam(id_conf):
                         abs_conf.send_beam_num(i+1)
                         next_beam.set_as_activebeam()
                         task = task_change_beam.apply_async((abs_conf.pk,), eta=date)
-                        print next_beam
+                        print (next_beam)
                     else:
                         abs_conf.send_beam_num(1)
                         beams_list[0].set_as_activebeam()
                         task = task_change_beam.apply_async((abs_conf.pk,), eta=date)
-                        print beams_list[0]
+                        print (beams_list[0])
                         i=0
                 else:

apps/main/forms.py +7 -7

                 def __init__(self, *args, **kwargs):
                     super(CampaignForm, self).__init__(*args, **kwargs)
                     self.fields['start_date'].widget = DatepickerWidget(self.fields['start_date'].widget.attrs)
-                    self.fields['end_date'].widget = DatepickerWidget(self.fields['end_date'].widget.attrs)
+                    self.fields['end_date'].widget   = DatepickerWidget(self.fields['end_date'].widget.attrs)
                     self.fields['description'].widget.attrs = {'rows': 2}
                     if self.instance.pk:
                 def __init__(self, *args, **kwargs):
                     super(ExperimentForm, self).__init__(*args, **kwargs)
                     self.fields['start_time'].widget = TimepickerWidget(self.fields['start_time'].widget.attrs)
-                    self.fields['end_time'].widget = TimepickerWidget(self.fields['end_time'].widget.attrs)
+                    self.fields['end_time'].widget   = TimepickerWidget(self.fields['end_time'].widget.attrs)
                 def save(self, *args, **kwargs):
-                    exp = super(ExperimentForm, self).save(*args, **kwargs)
+                    exp      = super(ExperimentForm, self).save(*args, **kwargs)
                     exp.name = exp.name.replace(' ', '')
                     exp.save()
                     return exp
                     campaigns = kwargs.pop('campaigns')
                     super(OperationForm, self).__init__(*args, **kwargs)
-                    self.fields['campaign'].label = 'Current Campaigns'
+                    self.fields['campaign'].label   = 'Current Campaigns'
                     self.fields['campaign'].choices = add_empty_choice(campaigns.values_list('id', 'name'))
             class ChangeIpForm(forms.Form):
                 ip_address = forms.GenericIPAddressField()
-                mask = forms.GenericIPAddressField(initial='255.255.255.0')
+                mask       = forms.GenericIPAddressField(initial='255.255.255.0')
-                gateway = forms.GenericIPAddressField(initial='0.0.0.0')
+                gateway    = forms.GenericIPAddressField(initial='0.0.0.0')
-                dns = forms.GenericIPAddressField(initial='0.0.0.0')
+                dns        = forms.GenericIPAddressField(initial='0.0.0.0')

apps/main/models.py +51 -51

             class Device(models.Model):
-                device_type = models.ForeignKey('DeviceType', on_delete=models.CASCADE)
+                device_type  = models.ForeignKey('DeviceType', on_delete=models.CASCADE)
-                location = models.ForeignKey('Location', on_delete=models.CASCADE)
+                location     = models.ForeignKey('Location', on_delete=models.CASCADE)
-                ip_address = models.GenericIPAddressField(protocol='IPv4', default='0.0.0.0')
+                ip_address   = models.GenericIPAddressField(protocol='IPv4', default='0.0.0.0')
                 port_address = models.PositiveSmallIntegerField(default=2000)
-                description = models.TextField(blank=True, null=True)
+                description  = models.TextField(blank=True, null=True)
-                status = models.PositiveSmallIntegerField(default=4, choices=DEV_STATES)
+                status       = models.PositiveSmallIntegerField(default=4, choices=DEV_STATES)
-                conf_active = models.PositiveIntegerField(default=0, verbose_name='Current configuration')
+                conf_active  = models.PositiveIntegerField(default=0, verbose_name='Current configuration')
                 class Meta:
                     db_table = 'db_devices'
                         headers = {'content-type': "application/json",
                                    'cache-control': "no-cache"}
-                        ip = [int(x) for x in ip_address.split('.')]
+                        ip      = [int(x) for x in ip_address.split('.')]
-                        dns = [int(x) for x in dns.split('.')]
+                        dns     = [int(x) for x in dns.split('.')]
                         gateway = [int(x) for x in gateway.split('.')]
-                        subnet = [int(x) for x in mask.split('.')]
+                        subnet  = [int(x) for x in mask.split('.')]
                         payload = {
                             "ip": ip,
                         try:
                             answer = req.json()
                             if answer['changeip']=='ok':
-                                self.message = '25|IP succesfully changed'
+                                self.message    = '25|IP succesfully changed'
                                 self.ip_address = ip_address
                                 self.save()
                             else:
             class Campaign(models.Model):
-                template = models.BooleanField(default=False)
+                template    = models.BooleanField(default=False)
-                name = models.CharField(max_length=60, unique=True)
+                name        = models.CharField(max_length=60, unique=True)
-                start_date = models.DateTimeField(blank=True, null=True)
+                start_date  = models.DateTimeField(blank=True, null=True)
-                end_date = models.DateTimeField(blank=True, null=True)
+                end_date    = models.DateTimeField(blank=True, null=True)
-                tags = models.CharField(max_length=40, blank=True, null=True)
+                tags        = models.CharField(max_length=40, blank=True, null=True)
                 description = models.TextField(blank=True, null=True)
                 experiments = models.ManyToManyField('Experiment', blank=True)
-                author = models.ForeignKey(User, null=True, blank=True,on_delete=models.CASCADE)
+                author      = models.ForeignKey(User, null=True, blank=True,on_delete=models.CASCADE)
                 class Meta:
                     db_table = 'db_campaigns'
                         data[field.name] = field.value_from_object(self)
                     data['start_date'] = data['start_date'].strftime('%Y-%m-%d')
-                    data['end_date'] = data['end_date'].strftime('%Y-%m-%d')
+                    data['end_date']   = data['end_date'].strftime('%Y-%m-%d')
                     return data
                     camp_parms = parms['campaigns']['byId'][parms['campaigns']['allIds'][0]]
-                    self.name = '{}-{}'.format(camp_parms['name'], datetime.now().strftime('%y%m%d'))
+                    self.name       = '{}-{}'.format(camp_parms['name'], datetime.now().strftime('%y%m%d'))
                     self.start_date = camp_parms['start_date']
-                    self.end_date = camp_parms['end_date']
+                    self.end_date   = camp_parms['end_date']
-                    self.tags = camp_parms['tags']
+                    self.tags       = camp_parms['tags']
                     self.save()
                     return self
                     for loc in locations:
                         dum = {}
-                        dum['name'] = loc.name
+                        dum['name']        = loc.name
-                        dum['id'] = loc.pk
+                        dum['id']          = loc.pk
                         dum['experiments'] = [e for e in self.experiments.all() if e.location==loc]
                         ret.append(dum)
             class RunningExperiment(models.Model):
-                radar = models.OneToOneField('Location', on_delete=models.CASCADE)
+                radar              = models.OneToOneField('Location', on_delete=models.CASCADE)
                 running_experiment = models.ManyToManyField('Experiment', blank = True)
-                status = models.PositiveSmallIntegerField(default=0, choices=RADAR_STATES)
+                status             = models.PositiveSmallIntegerField(default=0, choices=RADAR_STATES)
             class Experiment(models.Model):
-                template = models.BooleanField(default=False)
+                template   = models.BooleanField(default=False)
-                name = models.CharField(max_length=40, default='', unique=True)
+                name       = models.CharField(max_length=40, default='', unique=True)
-                location = models.ForeignKey('Location', null=True, blank=True, on_delete=models.CASCADE)
+                location   = models.ForeignKey('Location', null=True, blank=True, on_delete=models.CASCADE)
-                freq = models.FloatField(verbose_name='Operating Freq. (MHz)', validators=[MinValueValidator(1), MaxValueValidator(10000)], default=49.9200)
+                freq       = models.FloatField(verbose_name='Operating Freq. (MHz)', validators=[MinValueValidator(1), MaxValueValidator(10000)], default=49.9200)
                 start_time = models.TimeField(default='00:00:00')
-                end_time = models.TimeField(default='23:59:59')
+                end_time   = models.TimeField(default='23:59:59')
-                task = models.CharField(max_length=36, default='', blank=True, null=True)
+                task       = models.CharField(max_length=36, default='', blank=True, null=True)
-                status = models.PositiveSmallIntegerField(default=4, choices=EXP_STATES)
+                status     = models.PositiveSmallIntegerField(default=4, choices=EXP_STATES)
-                author = models.ForeignKey(User, null=True, blank=True,on_delete=models.CASCADE)
+                author     = models.ForeignKey(User, null=True, blank=True,on_delete=models.CASCADE)
-                hash = models.CharField(default='', max_length=64, null=True, blank=True)
+                hash       = models.CharField(default='', max_length=64, null=True, blank=True)
                 class Meta:
                     db_table = 'db_experiments'
                         data[field.name] = field.value_from_object(self)
                     data['start_time'] = data['start_time'].strftime('%H:%M:%S')
-                    data['end_time'] = data['end_time'].strftime('%H:%M:%S')
+                    data['end_time']   = data['end_time'].strftime('%H:%M:%S')
-                    data['location'] = self.location.name
+                    data['location']   = self.location.name
                     data['configurations'] = ['{}'.format(conf.pk) for
                         conf in Configuration.objects.filter(experiment=self, type=0)]
                     confs = []
                     allconfs = Configuration.objects.filter(experiment=self, type = 0).order_by('-device__device_type__sequence')
-                    rc_mix = [conf for conf in allconfs if conf.device.device_type.name=='rc' and conf.mix]
+                    rc_mix   = [conf for conf in allconfs if conf.device.device_type.name=='rc' and conf.mix]
                     if rc_mix:
                         for conf in allconfs:
                             if conf.device.device_type.name == 'rc' and  not conf.mix:
                     '''
                     confs = Configuration.objects.filter(experiment=self, type = 0).order_by('device__device_type__sequence')
-                    confs=confs.exclude(device__device_type__name='cgs')
+                    confs = confs.exclude(device__device_type__name='cgs')
                     try:
                         for conf in confs:
                             conf.stop_device()
                     for id_conf in exp_parms['configurations']:
                         conf_parms = parms['configurations']['byId'][id_conf]
-                        device = Device.objects.filter(device_type__name=conf_parms['device_type'])[0]
+                        device     = Device.objects.filter(device_type__name=conf_parms['device_type'])[0]
-                        model = CONF_MODELS[conf_parms['device_type']]
+                        model      = CONF_MODELS[conf_parms['device_type']]
                         conf = model(
                             experiment = self,
                             device = device,
                     location, created = Location.objects.get_or_create(name=exp_parms['location'])
                     self.name = '{}-{}'.format(exp_parms['name'], datetime.now().strftime('%y%m%d'))
-                    self.location = location
+                    self.location   = location
                     self.start_time = exp_parms['start_time']
-                    self.end_time = exp_parms['end_time']
+                    self.end_time   = exp_parms['end_time']
                     self.save()
                     return self
             class Configuration(PolymorphicModel):
-                template = models.BooleanField(default=False)
+                template        = models.BooleanField(default=False)
-                # name = models.CharField(verbose_name="Configuration Name", max_length=40, default='')
+                # name          = models.CharField(verbose_name="Configuration Name", max_length=40, default='')
-                device = models.ForeignKey('Device', verbose_name='Device', null=True, on_delete=models.CASCADE)
+                device          = models.ForeignKey('Device', verbose_name='Device', null=True, on_delete=models.CASCADE)
-                label = models.CharField(verbose_name="Label", max_length=40, default='', blank=True, null=True)
+                label           = models.CharField(verbose_name="Label", max_length=40, default='', blank=True, null=True)
-                experiment = models.ForeignKey('Experiment', verbose_name='Experiment', null=True, blank=True, on_delete=models.CASCADE)
+                experiment      = models.ForeignKey('Experiment', verbose_name='Experiment', null=True, blank=True, on_delete=models.CASCADE)
-                type = models.PositiveSmallIntegerField(default=0, choices=CONF_TYPES)
+                type            = models.PositiveSmallIntegerField(default=0, choices=CONF_TYPES)
-                created_date = models.DateTimeField(auto_now_add=True)
+                created_date    = models.DateTimeField(auto_now_add=True)
                 programmed_date = models.DateTimeField(auto_now=True)
-                parameters = models.TextField(default='{}')
+                parameters      = models.TextField(default='{}')
-                author = models.ForeignKey(User, null=True, blank=True,on_delete=models.CASCADE)
+                author          = models.ForeignKey(User, null=True, blank=True,on_delete=models.CASCADE)
-                hash = models.CharField(default='', max_length=64, null=True, blank=True)
+                hash            = models.CharField(default='', max_length=64, null=True, blank=True)
                 message = ""
                 class Meta:

apps/main/tasks.py +21 -11

             from datetime import timedelta, datetime
             from .models import Experiment
+            from celery import Celery
+            from celery.utils.log import get_task_logger
+            from django.utils import timezone
+            logger = get_task_logger(__name__)
             @task
             def task_start(id_exp):
-                exp = Experiment.objects.get(pk=id_exp)
+                exp    = Experiment.objects.get(pk=id_exp)
                 status = exp.status
                 if exp.status == 2:
                     print('Experiment {} already running start task not executed'.format(exp))
                     return 2
                 if status == 3:
-                    now = datetime.now()
+                    now   = datetime.now()
                     start = datetime.combine(now.date(), exp.start_time)
-                    end = datetime.combine(now.date(), exp.end_time)
+                    end   = datetime.combine(now.date(), exp.end_time)
+                    print(now)
+                    print(start)
+                    print(end)
                     if end < start:
                         end += timedelta(1)
                     try:
                         print('Error')
                         exp.status = 0
                     if exp.status == 2:
-                        task = task_stop.apply_async((id_exp,), eta=end+timedelta(hours=5))
+                        task = task_stop.apply_async((id_exp,),eta=end) #Antiguo eta=end+timedelta(hours=5))
                         exp.task = task.id
                 exp.save()
                 return exp.status
                         print('Error')
                         exp.status = 0
-                now = datetime.now()
+                now        = datetime.now()
-                start = datetime.combine(now.date()+timedelta(1), exp.start_time)
+                start      = datetime.combine(now.date()+timedelta(1), exp.start_time)
-                task = task_start.apply_async((id_exp, ), eta=start+timedelta(hours=5))
+                task       = task_start.apply_async((id_exp, ), eta=start) #Antiguo eta=start+timedelta(hours=5))
-                exp.task = task.id
+                exp.task   = task.id
                 exp.status = 3
                 exp.save()
                 return exp.status
             #Task to get status
             @task
             def task_status(id_exp):
+                print ("task status"+str(id_exp))
                 exp = Experiment.objects.get(pk=id_exp)
                 if exp.status==2:
                     run_every = timedelta(minutes=1)
-                    now = datetime.utcnow()
+                    now       = datetime.utcnow()
-                    date = now + run_every
+                    date      = now + run_every
                     task_status.apply_async((id_exp,), eta=date)
                     print ("Monitoring...")
                     exp.get_status()

apps/main/urls.py +1 0

                 path('experiment/<int:id_exp>/new_dev_conf/', views.dev_conf_new, name='url_add_dev_conf'),
                 path('experiment/<int:id_exp>/new_dev_conf/<int:id_dev>/', views.dev_conf_new, name='url_add_dev_conf'),
                 path('dev_conf/', views.dev_confs, name='url_dev_confs'),
                 path('dev_conf/<int:id_conf>/', views.dev_conf, name='url_dev_conf'),
                 path('dev_conf/<int:id_conf>/edit/', views.dev_conf_edit, name='url_edit_dev_conf'),

apps/main/views.py +71 -51

             from django.http.request import QueryDict
             from django.contrib.auth.decorators import login_required, user_passes_test
+            from django.utils.timezone import is_aware
             try:
                 from urllib.parse import urlencode
             except ImportError:
             from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm, LocationForm, UploadFileForm, DownloadFileForm, OperationForm, NewForm
             from .forms import OperationSearchForm, FilterForm, ChangeIpForm
-            from .tasks import task_start
             from apps.rc.forms import RCConfigurationForm, RCLineCode, RCMixConfigurationForm
             from apps.dds.forms import DDSConfigurationForm
             from apps.jars.forms import JARSConfigurationForm
             from apps.dds_rest.forms import DDSRestConfigurationForm
             from .utils import Params
-            from .models import Campaign, Experiment, Device, Configuration, Location, RunningExperiment, DEV_STATES
+            from .models              import Campaign, Experiment, Device, Configuration, Location, RunningExperiment, DEV_STATES
-            from apps.cgs.models import CGSConfiguration
+            from apps.cgs.models      import CGSConfiguration
-            from apps.jars.models import JARSConfiguration, EXPERIMENT_TYPE
+            from apps.jars.models     import JARSConfiguration, EXPERIMENT_TYPE
-            from apps.usrp.models import USRPConfiguration
+            from apps.usrp.models     import USRPConfiguration
-            from apps.abs.models import ABSConfiguration
+            from apps.abs.models      import ABSConfiguration
-            from apps.rc.models import RCConfiguration, RCLine, RCLineType, RCClock
+            from apps.rc.models       import RCConfiguration, RCLine, RCLineType, RCClock
-            from apps.dds.models import DDSConfiguration
+            from apps.dds.models      import DDSConfiguration
             from apps.dds_rest.models import DDSRestConfiguration
+            from .tasks import task_start
             from radarsys.celery import app
+            #comentario test
             CONF_FORMS = {
                 'rc': RCConfigurationForm,
                 'dds': DDSConfigurationForm,
                         campaign.save()
                         return redirect('url_campaign', id_camp=campaign.id)
-                kwargs['form'] = form
+                kwargs['form']           = form
-                kwargs['title'] = 'Campaign'
+                kwargs['title']          = 'Campaign'
-                kwargs['suptitle'] = 'New'
+                kwargs['suptitle']       = 'New'
                 kwargs['menu_campaigns'] = 'active'
                 return render(request, 'campaign_edit.html', kwargs)
                     form = CampaignForm(instance=campaign)
                 if request.method == 'POST':
-                    exps = campaign.experiments.all().values_list('pk', flat=True)
+                    exps     = campaign.experiments.all().values_list('pk', flat=True)
-                    post = request.POST.copy()
+                    post     = request.POST.copy()
                     new_exps = post.getlist('experiments')
                     post.setlist('experiments', [])
-                    form = CampaignForm(post, instance=campaign)
+                    form     = CampaignForm(post, instance=campaign)
                     if form.is_valid():
                         camp = form.save()
                         return redirect('url_campaign', id_camp=id_camp)
-                kwargs = {}
+                kwargs                   = {}
-                kwargs['form'] = form
+                kwargs['form']           = form
-                kwargs['title'] = 'Campaign'
+                kwargs['title']          = 'Campaign'
-                kwargs['suptitle'] = 'Edit'
+                kwargs['suptitle']       = 'Edit'
-                kwargs['button'] = 'Update'
+                kwargs['button']         = 'Update'
                 kwargs['menu_campaigns'] = 'active'
                 return render(request, 'campaign_edit.html', kwargs)
                         experiment = form.save()
                         return redirect('url_experiment', id_exp=experiment.id)
-                kwargs = {}
+                kwargs                     = {}
-                kwargs['form'] = form
+                kwargs['form']             = form
-                kwargs['title'] = 'Experiment'
+                kwargs['title']            = 'Experiment'
-                kwargs['suptitle'] = 'Edit'
+                kwargs['suptitle']         = 'Edit'
-                kwargs['button'] = 'Update'
+                kwargs['button']           = 'Update'
                 kwargs['menu_experiments'] = 'active'
                 return render(request, 'experiment_edit.html', kwargs)
             @login_required
             def radar_start(request, id_camp, id_radar):
-                campaign = get_object_or_404(Campaign, pk=id_camp)
+                campaign    = get_object_or_404(Campaign, pk=id_camp)
                 experiments = campaign.get_experiments_by_radar(id_radar)[0]['experiments']
-                now = datetime.now()
+                now         = datetime.now()
                 for exp in experiments:
+                    #app.control.revoke(exp.task)
+                    print(exp.status)
                     start = datetime.combine(datetime.now().date(), exp.start_time)
-                    end = datetime.combine(datetime.now().date(), exp.end_time)
+                    end   = datetime.combine(datetime.now().date(), exp.end_time)
+                    print(exp.start_time)
+                    print(exp.end_time)
+                    print(start)
+                    print(end)
+                    print(is_aware(start))
+                    print(campaign.start_date)
+                    print(campaign.end_date)
+                    print(is_aware(campaign.start_date))
                     if end < start:
                         end += timedelta(1)
                         continue
                     app.control.revoke(exp.task)
+                    print("Llego luego del revoke")
                     if now > start and now <= end:
+                        print("Caso now >start and <end")
                         task = task_start.delay(exp.id)
                         exp.status = task.wait()
                         if exp.status == 0:
                         if exp.status == 2:
                             messages.success(request, 'Experiment {} started'.format(exp))
                     else:
-                        task = task_start.apply_async(
+                        print("Caso now < start o >end")
-                            (exp.pk, ), eta=start+timedelta(hours=5))
+                        task = task_start.apply_async((exp.pk, ), eta=start)#start+timedelta(hours=5))
-                        exp.task = task.id
+                        exp.task   = task.id
                         exp.status = 3
-                        messages.success(
+                        messages.success(request, 'Experiment {} programmed to start at {}'.format(exp, start))
-                            request, 'Experiment {} programmed to start at {}'.format(exp, start))
                     exp.save()
             @login_required
             def radar_stop(request, id_camp, id_radar):
-                campaign = get_object_or_404(Campaign, pk=id_camp)
+                campaign    = get_object_or_404(Campaign, pk=id_camp)
                 experiments = campaign.get_experiments_by_radar(id_radar)[0]['experiments']
+                print("Ingreso en stop radar_stop")
                 for exp in experiments:
                     if exp.task:
+                        print("Ingreso antes de revoke stop")
                         app.control.revoke(exp.task)
-                    if exp.status == 2:
+                    if exp.status == 2: #status 2 es started
+                        print("llama a exp.stop")
                         exp.stop()
                         messages.warning(request, 'Experiment {} stopped'.format(exp))
                     exp.status = 1
             @login_required
             def radar_refresh(request, id_camp, id_radar):
-                campaign = get_object_or_404(Campaign, pk=id_camp)
+                campaign    = get_object_or_404(Campaign, pk=id_camp)
                 experiments = campaign.get_experiments_by_radar(id_radar)[0]['experiments']
-                i = app.control.inspect()
+                i         = app.control.inspect()
-                scheduled = i.scheduled().values()[0]
+                print(i)
-                revoked = i.revoked().values()[0]
+                print(i.scheduled())
+                print(i.scheduled().values())
+                scheduled = list(i.scheduled().values())[0]
+                revoked   = list(i.revoked().values())[0]
                 for exp in experiments:
                     if exp.task in revoked:
             @login_required
             def revoke_tasks(request, id_camp):
-                i = app.control.inspect()
+                i         = app.control.inspect()
-                scheduled = i.scheduled().values()[0]
+                scheduled = list(i.scheduled().values())[0]
-                revoked = i.revoked().values()[0]
+                revoked   = list(i.revoked().values())[0]
                 for t in scheduled:
                     if t['request']['id'] in revoked:
                         continue
                     app.control.revoke(t['request']['id'])
-                    exp = Experiment.objects.get(pk=eval(t['request']['args'])[0])
+                    exp  = Experiment.objects.get(pk=eval(str(t['request']['args']))[0])
-                    eta = t['eta']
+                    eta  = t['eta']
                     task = t['request']['name'].split('.')[-1]
                     messages.warning(request, 'Scheduled {} at {} for experiment {} revoked'.format(task, eta, exp.name))
             @login_required
             def show_tasks(request, id_camp):
-                i = app.control.inspect()
+                i         = app.control.inspect()
-                scheduled = i.scheduled().values()[0]
+                scheduled = list(i.scheduled().values())[0]
-                revoked = i.revoked().values()[0]
+                revoked   = list(i.revoked().values())[0]
                 for t in scheduled:
                     if t['request']['id'] in revoked:
                         continue
-                    exp = Experiment.objects.get(pk=eval(t['request']['args'])[0])
+                    exp = Experiment.objects.get(pk=eval(str(t['request']['args']))[0])
                     eta = t['eta']
                     task = t['request']['name'].split('.')[-1]
                     messages.success(request, 'Task {} scheduled at {} for experiment {}'.format(task, eta, exp.name))

radarsys/celery.py +1 -1

             # set the default Django settings module for the 'celery' program.
             os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'radarsys.settings')
             app = Celery('radarsys')
+            app.conf.timezone = 'America/Lima'
             # Using a string here means the worker will not have to
             # pickle the object when using Windows.
             app.config_from_object('django.conf:settings')

radarsys/settings.py +4 -3

             LANGUAGE_CODE = 'en-us'
+            USE_TZ   = False
             TIME_ZONE = os.environ.get('TZ', 'America/Lima')
             USE_I18N = True
             USE_L10N = True
-            USE_TZ = False
             # Static files (CSS, JavaScript, Images)
             # https://docs.djangoproject.com/en/1.8/howto/static-files/
             # Celery stuff
             REDIS_HOST = os.environ.get('REDIS_HOST', '127.0.0.1')
-            REDIS_PORT = os.environ.get('REDIS_PORT', 6300)
+            REDIS_PORT = os.environ.get('REDIS_PORT', 6379)
             BROKER_TRANSPORT = 'redis'
             BROKER_URL       = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT)
             CELERY_TASK_SERIALIZER   = 'json'
             CELERY_RESULT_SERIALIZER = 'json'
             CELERY_ENABLE_UTC        = False
+            CELERY_TIMEZONE          = 'America/Lima'

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages