diff --git a/.env b/.env
index 9d4911e..e33b8bb 100644
--- a/.env
+++ b/.env
@@ -18,8 +18,8 @@ TZ=America/Lima
DOCKER_DATA=/data/dockers/radarsys/
LOCAL_IP=192.168.1.128
-# MQTT_SERVER=10.10.10.200
-MQTT_SERVER = 192.168.100.5
+MQTT_SERVER=10.10.10.200
+# MQTT_SERVER = 192.168.100.5
MQTT_PORT = 1883
MQTT_KEEPALIVE = 3660
diff --git a/apps/abs/templates/abs_conf_mqtt.html b/apps/abs/templates/abs_conf_mqtt.html
index 89dac85..8244661 100644
--- a/apps/abs/templates/abs_conf_mqtt.html
+++ b/apps/abs/templates/abs_conf_mqtt.html
@@ -82,10 +82,10 @@
{{beam.get_upvalues.3}} |
- {{beam.get_downvalues.0}} |
- {{beam.get_downvalues.1}} |
- {{beam.get_downvalues.2}} |
- {{beam.get_downvalues.3}} |
+ {{beam.get_downvalues.0}} |
+ {{beam.get_downvalues.1}} |
+ {{beam.get_downvalues.2}} |
+ {{beam.get_downvalues.3}} |
{{beam.get_upvalues.8}} |
@@ -94,10 +94,10 @@
{{beam.get_upvalues.11}} |
- {{beam.get_downvalues.8}} |
- {{beam.get_downvalues.9}} |
- {{beam.get_downvalues.10}} |
- {{beam.get_downvalues.11}} |
+ {{beam.get_downvalues.8}} |
+ {{beam.get_downvalues.9}} |
+ {{beam.get_downvalues.10}} |
+ {{beam.get_downvalues.11}} |
{{beam.get_upvalues.16}} |
@@ -106,10 +106,10 @@
{{beam.get_upvalues.19}} |
- {{beam.get_downvalues.16}} |
- {{beam.get_downvalues.17}} |
- {{beam.get_downvalues.18}} |
- {{beam.get_downvalues.19}} |
+ {{beam.get_downvalues.16}} |
+ {{beam.get_downvalues.17}} |
+ {{beam.get_downvalues.18}} |
+ {{beam.get_downvalues.19}} |
{{beam.get_upvalues.24}} |
@@ -118,10 +118,10 @@
{{beam.get_upvalues.27}} |
- {{beam.get_downvalues.24}} |
- {{beam.get_downvalues.25}} |
- {{beam.get_downvalues.26}} |
- {{beam.get_downvalues.27}} |
+ {{beam.get_downvalues.24}} |
+ {{beam.get_downvalues.25}} |
+ {{beam.get_downvalues.26}} |
+ {{beam.get_downvalues.27}} |
@@ -135,10 +135,10 @@
{{beam.get_upvalues.7}} |
- {{beam.get_downvalues.4}} |
- {{beam.get_downvalues.5}} |
- {{beam.get_downvalues.6}} |
- {{beam.get_downvalues.7}} |
+ {{beam.get_downvalues.4}} |
+ {{beam.get_downvalues.5}} |
+ {{beam.get_downvalues.6}} |
+ {{beam.get_downvalues.7}} |
{{beam.get_upvalues.12}} |
@@ -147,10 +147,10 @@
{{beam.get_upvalues.15}} |
- {{beam.get_downvalues.12}} |
- {{beam.get_downvalues.13}} |
- {{beam.get_downvalues.14}} |
- {{beam.get_downvalues.15}} |
+ {{beam.get_downvalues.12}} |
+ {{beam.get_downvalues.13}} |
+ {{beam.get_downvalues.14}} |
+ {{beam.get_downvalues.15}} |
{{beam.get_upvalues.20}} |
@@ -159,10 +159,10 @@
{{beam.get_upvalues.23}} |
- {{beam.get_downvalues.20}} |
- {{beam.get_downvalues.21}} |
- {{beam.get_downvalues.22}} |
- {{beam.get_downvalues.23}} |
+ {{beam.get_downvalues.20}} |
+ {{beam.get_downvalues.21}} |
+ {{beam.get_downvalues.22}} |
+ {{beam.get_downvalues.23}} |
{{beam.get_upvalues.28}} |
@@ -171,10 +171,10 @@
{{beam.get_upvalues.31}} |
- {{beam.get_downvalues.28}} |
- {{beam.get_downvalues.29}} |
- {{beam.get_downvalues.30}} |
- {{beam.get_downvalues.31}} |
+ {{beam.get_downvalues.28}} |
+ {{beam.get_downvalues.29}} |
+ {{beam.get_downvalues.30}} |
+ {{beam.get_downvalues.31}} |
@@ -190,10 +190,10 @@
{{beam.get_upvalues.35}} |
- {{beam.get_downvalues.32}} |
- {{beam.get_downvalues.33}} |
- {{beam.get_downvalues.34}} |
- {{beam.get_downvalues.35}} |
+ {{beam.get_downvalues.32}} |
+ {{beam.get_downvalues.33}} |
+ {{beam.get_downvalues.34}} |
+ {{beam.get_downvalues.35}} |
{{beam.get_upvalues.40}} |
@@ -202,10 +202,10 @@
{{beam.get_upvalues.43}} |
- {{beam.get_downvalues.40}} |
- {{beam.get_downvalues.41}} |
- {{beam.get_downvalues.42}} |
- {{beam.get_downvalues.43}} |
+ {{beam.get_downvalues.40}} |
+ {{beam.get_downvalues.41}} |
+ {{beam.get_downvalues.42}} |
+ {{beam.get_downvalues.43}} |
{{beam.get_upvalues.48}} |
@@ -214,10 +214,10 @@
{{beam.get_upvalues.51}} |
- {{beam.get_downvalues.48}} |
- {{beam.get_downvalues.49}} |
- {{beam.get_downvalues.50}} |
- {{beam.get_downvalues.51}} |
+ {{beam.get_downvalues.48}} |
+ {{beam.get_downvalues.49}} |
+ {{beam.get_downvalues.50}} |
+ {{beam.get_downvalues.51}} |
{{beam.get_upvalues.56}} |
@@ -226,10 +226,10 @@
{{beam.get_upvalues.59}} |
- {{beam.get_downvalues.56}} |
- {{beam.get_downvalues.57}} |
- {{beam.get_downvalues.58}} |
- {{beam.get_downvalues.59}} |
+ {{beam.get_downvalues.56}} |
+ {{beam.get_downvalues.57}} |
+ {{beam.get_downvalues.58}} |
+ {{beam.get_downvalues.59}} |
@@ -243,10 +243,10 @@
{{beam.get_upvalues.39}} |
- {{beam.get_downvalues.36}} |
- {{beam.get_downvalues.37}} |
- {{beam.get_downvalues.38}} |
- {{beam.get_downvalues.39}} |
+ {{beam.get_downvalues.36}} |
+ {{beam.get_downvalues.37}} |
+ {{beam.get_downvalues.38}} |
+ {{beam.get_downvalues.39}} |
{{beam.get_upvalues.44}} |
@@ -255,10 +255,10 @@
{{beam.get_upvalues.47}} |
- {{beam.get_downvalues.44}} |
- {{beam.get_downvalues.45}} |
- {{beam.get_downvalues.46}} |
- {{beam.get_downvalues.47}} |
+ {{beam.get_downvalues.44}} |
+ {{beam.get_downvalues.45}} |
+ {{beam.get_downvalues.46}} |
+ {{beam.get_downvalues.47}} |
{{beam.get_upvalues.52}} |
@@ -267,10 +267,10 @@
{{beam.get_upvalues.55}} |
- {{beam.get_downvalues.52}} |
- {{beam.get_downvalues.53}} |
- {{beam.get_downvalues.54}} |
- {{beam.get_downvalues.55}} |
+ {{beam.get_downvalues.52}} |
+ {{beam.get_downvalues.53}} |
+ {{beam.get_downvalues.54}} |
+ {{beam.get_downvalues.55}} |
{{beam.get_upvalues.60}} |
@@ -279,10 +279,10 @@
{{beam.get_upvalues.63}} |
- {{beam.get_downvalues.60}} |
- {{beam.get_downvalues.61}} |
- {{beam.get_downvalues.62}} |
- {{beam.get_downvalues.63}} |
+ {{beam.get_downvalues.60}} |
+ {{beam.get_downvalues.61}} |
+ {{beam.get_downvalues.62}} |
+ {{beam.get_downvalues.63}} |
@@ -363,17 +363,26 @@
for (let i=1; i<=64;i++){
var elemento = document.getElementById(text[i-1]);
+ var elemento2 = document.getElementById(text[i-1]+100);
if (text[i-1]<=64){
console.log("1")
// elemento=document.getElementById(text[i-1]);
elemento.style.color="green";
- elemento.style.fontWeight = "bold"}
+ elemento.style.fontWeight = "bold";
+ elemento2.style.color="green";
+ elemento2.style.fontWeight = "bold";}
else if (text[i-1]>64){
elemento=document.getElementById(text[i-1]-64);
- elemento.style.color="blue";
- elemento.style.fontWeight = "bold"}
- else {elemento.style.color="red";
- elemento.style.fontWeight = "bold"}
+ elemento2=document.getElementById(text[i-1]-64+100);
+ elemento.style.color="yellow";
+ elemento.style.fontWeight = "bold";
+ elemento2.style.color="yellow";
+ elemento2.style.fontWeight = "bold"}
+ else {
+ elemento.style.color="red";
+ elemento.style.fontWeight = "bold";
+ elemento2.style.color="red";
+ elemento2.style.fontWeight = "bold"}
}
diff --git a/apps/main/management/commands/hello.py b/apps/main/management/commands/hello.py
new file mode 100644
index 0000000..a4aa5bd
--- /dev/null
+++ b/apps/main/management/commands/hello.py
@@ -0,0 +1,19 @@
+from django.core.management.base import BaseCommand
+
+
+class Command(BaseCommand):
+ """
+ Restart experiment every night at 05:00 am.
+ Example:
+ manage.py restart_experiment
+ """
+ def handle(self, *args, **options):
+ print("Hola")
+
+# def main():
+# print("Hola")
+
+# if __name__=='__main__':
+# main()
+
+
diff --git a/docker-compose.yml b/docker-compose.yml
index 25c65cd..ddf7187 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,6 +14,15 @@ services:
volumes:
- './:/radarsys'
- '${DOCKER_DATA}/static:/radarsys/static'
+ labels:
+ ofelia.enabled: "true"
+ # ofelia.job-exec.restart-reception.schedule: "0 1/5 * * * *"
+ ofelia.job-exec.test.schedule: "@every 5s"
+ ofelia.job-exec.test.command: "python manage.py hello"
+ # ofelia.job-exec.restart-pedestal.schedule: "0 2/10 * * * *"
+ # ofelia.job-exec.restart-pedestal.command: "python manage.py restart_pedestal"
+ # ofelia.job-exec.restart-experiment.schedule: "@midnight"
+ # ofelia.job-exec.restart-experiment.command: "python manage.py restart_experiment"
depends_on:
- radarsys-postgres
@@ -42,6 +51,22 @@ services:
depends_on:
- radarsys
+ #Ofelia Scheduler
+ radarsys-job:
+ container_name: 'radarsys-job'
+ image: mcuadros/ofelia:v0.3.6
+ depends_on:
+ - radarsys
+ # networks:
+ # - backend_sirm
+ command: daemon --docker
+ volumes:
+ - /var/run/docker.sock:/var/run/docker.sock:ro
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "12m"
+
volumes:
pgdata:
driver: local
diff --git a/nginx/sites-enabled/radarsys.conf b/nginx/sites-enabled/radarsys.conf
index 26bce09..5bdf7cf 100644
--- a/nginx/sites-enabled/radarsys.conf
+++ b/nginx/sites-enabled/radarsys.conf
@@ -17,7 +17,7 @@ server {
location / {
proxy_pass http://django;
proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header Host $host;
+ proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_http_version 1.1;
diff --git a/radarsys/settings.py b/radarsys/settings.py
index 7a201b0..aec2409 100644
--- a/radarsys/settings.py
+++ b/radarsys/settings.py
@@ -145,23 +145,6 @@ STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
)
-# # Celery stuff
-
-# REDIS_HOST = os.environ.get('REDIS_HOST', 'localhost')
-# #REDIS_HOST = os.environ.get('REDIS_HOST', '127.0.0.1')
-# REDIS_PORT = os.environ.get('REDIS_PORT', 6379)
-
-# BROKER_TRANSPORT = 'redis'
-# #BROKER_URL = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT)
-# BROKER_URL = 'redis://{}:{}'.format(REDIS_HOST, REDIS_PORT)
-
-# CELERY_RESULT_BACKEND = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT)
-# CELERY_BROKER_TRANSPORT = BROKER_URL
-# CELERY_ACCEPT_CONTENT = ['application/json']
-# CELERY_TASK_SERIALIZER = 'json'
-# CELERY_RESULT_SERIALIZER = 'json'
-# CELERY_ENABLE_UTC = False
-# CELERY_TIMEZONE = 'America/Lima'
import django
from django.utils.encoding import force_str