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 0 0

NO CONTENT: modified file

apps/main/models.py 0 0

NO CONTENT: modified file

apps/main/tasks.py +13 -3

             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):
                     now   = datetime.now()
                     start = datetime.combine(now.date(), exp.start_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
                 now        = datetime.now()
                 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.status = 3
                 exp.save()
             #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)

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 +38 -18

             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.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    = get_object_or_404(Campaign, pk=id_camp)
                 experiments = campaign.get_experiments_by_radar(id_radar)[0]['experiments']
                 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)
+                    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.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()
                 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
                 experiments = campaign.get_experiments_by_radar(id_radar)[0]['experiments']
                 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:
             def revoke_tasks(request, id_camp):
                 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']
                     task = t['request']['name'].split('.')[-1]
                     messages.warning(request, 'Scheduled {} at {} for experiment {} revoked'.format(task, eta, exp.name))
             def show_tasks(request, id_camp):
                 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