realtime_web Commit - r45:08ba8fe1a748

docker-compose.yml +37 -10

@@ -1,4 +1,4
1	version: '2'	1	version: '3'
2		2
3	services:	3	services:
4	web:	4	web:
@@ -6,15 +6,20 services:
6	build: .	6	build: .
7	restart: always	7	restart: always
8	image: realtime	8	image: realtime
9	command: python manage.py runserver 0.0.0.0:8000	9	# command: python manage.py runserver 0.0.0.0:8000
		10	# command: gunicorn realtime.wsgi:application --bind 0.0.0.0:8080
		11	command: daphne -b 0.0.0.0 -p 8080 realtime.asgi:application
10	env_file: .env	12	env_file: .env
11	ports:	13	# ports:
12	- "80~~00:8000~~"	14	# - "8081:8081"
		15	# expose:
		16	# - 8000
13	links:	17	links:
14	- redis	18	- redis
15	- mongo	19	- mongo
16	volumes:	20	volumes:
17	- './:${APP_DIR}'	21	- './:${APP_DIR}'
		22	- './static:/static'
18	depends_on:	23	depends_on:
19	- redis	24	- redis
20	- mongo	25	- mongo
@@ -37,9 +42,9 services:
37		42
38	redis:	43	redis:
39	container_name: 'realtime_redis'	44	container_name: 'realtime_redis'
40	image: 'redis:~~3.2~~-alpine'	45	image: 'redis:5.0-alpine'
41	volumes:	46	volumes:
42	- 'redis~~data~~:/data'	47	- '/data/dockers/realtime/redis:/data'
43		48
44	mongo:	49	mongo:
45	container_name: 'realtime_mongo'	50	container_name: 'realtime_mongo'
@@ -48,8 +53,30 services:
48	ports:	53	ports:
49	- '127.0.0.1:27017:27017'	54	- '127.0.0.1:27017:27017'
50	volumes:	55	volumes:
51	- 'mongo~~data~~:/data/db'	56	- '/data/dockers/realtime/mongo:/data/db'
		57
		58	#volumes:
		59	# redisdata:
		60	# mongodata:
		61
		62	nginx:
		63	image: nginx:1.15-alpine
		64	volumes:
		65	- ./static:/static
		66	- ./nginx:/etc/nginx/conf.d
		67	- ./certbot/conf:/etc/letsencrypt
		68	- ./certbot/www:/var/www/certbot
		69	ports:
		70	- "8000:8000"
		71	- "443:443"
		72	depends_on:
		73	- web
		74	command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
		75
		76	certbot:
		77	image: certbot/certbot:latest
		78	volumes:
		79	- ./certbot/conf:/etc/letsencrypt
		80	- ./certbot/www:/var/www/certbot
		81	entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
52		82
53	volumes:
54	redisdata:
55	mongodata: No newline at end of file

plotter/consumers.py +1 -1

                             'plot': plot
                             })
                         if meta1:
-                            if meta1['metadata']['type'] in ('pcolor',):
+                            if meta1['metadata']['type'] in ('pcolor', 'image'):
                                 datas = DB.plot_data.find(
                                     {'plot': meta1['_id']},
                                     ['time', 'data'],

plotter/routing.py +5 -5

-            from django.conf.urls import url
+            from django.urls import re_path
             from . import consumers
             websocket_urlpatterns = [
-                url(r'^ws/main/$', consumers.MainConsumer),
+                re_path(r'^ws/main/$', consumers.MainConsumer.as_asgi()),
-                url(r'^ws/realtime/(?P<code>[^/]+)/(?P<plot>[^/]+)/$', consumers.PlotConsumer),
+                re_path(r'^ws/realtime/(?P<code>[^/]+)/(?P<plot>[^/]+)/$', consumers.PlotConsumer.as_asgi()),
-                url(r'^ws/database/(?P<code>[^/]+)/(?P<plot>[^/]+)/$', consumers.PlotConsumer),
+                re_path(r'^ws/database/(?P<code>[^/]+)/(?P<plot>[^/]+)/$', consumers.PlotConsumer.as_asgi()),
-            ]
  No newline at end of file

plotter/templates/footer_igp.html +3 -3

                     </ul>
                 </div>
                 <iframe class="map d-none d-sm-block"
-                    src="https://www.google.com/maps/embed?pb=!1m14!1m8!1m3!1d3901.828012758223!2d-76.94633793139629!3d-12.055351713347235!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x0%3A0x7ea774b6fa66a3c6!2sInstituto+Geof%C3%ADsico+del+Per%C3%BA!5e0!3m2!1ses-419!2spe!4v1545658855595"
+             	src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d31226.562310315738!2d-76.89329626296218!3d-11.952312343404692!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x9105c3290814e129%3A0x61f92c3cfc90797b!2sRadio%20Observatorio%20de%20Jicamarca!5e0!3m2!1sen!2spe!4v1613758699300!5m2!1sen!2spe"
-                    width="100%" height="100%" frameborder="0" allowfullscreen="false">&#160;
+            	width="100%" height="100%" frameborder="0" allowfullscreen="false">&#160;
                 </iframe>
-            </footer>
  No newline at end of file
+            </footer>

plotter/templates/home.html +3 -2

             {% endif %}
             {% endblock %}
             {% block script %}
             <script>
-                var socket = new WebSocket('ws://' + window.location.host +'/ws/main/');
+                var ws_scheme = window.location.protocol == "https:" ? "wss" : "ws";
+                var socket = new WebSocket(ws_scheme + '://' + window.location.host +'/ws/main/');
                 socket.onopen = function open() {
                   console.log('Main WebSockets connection created.');
                 };

plotter/templates/plot.html +4 -3

               /* This conditional is used to know if we have to setup the data
                or just update the last data*/
               $("#loader").css("display", "block");
+              var ws_scheme = window.location.protocol == "https:" ? "wss" : "ws";
               {% if realtime %}
-              var socket = new WebSocket('ws://' + window.location.host + '/ws/realtime/{{code}}/{{plot}}/');
+              var socket = new WebSocket(ws_scheme + '://' + window.location.host + '/ws/realtime/{{code}}/{{plot}}/');
               {% else %}
-              var socket = new WebSocket('ws://' + window.location.host + '/ws/database/{{code}}/{{plot}}/');
+              var socket = new WebSocket(ws_scheme + '://' + window.location.host + '/ws/database/{{code}}/{{plot}}/');
               {% endif %}
               socket.onopen = function open() {
                 console.log('WebSockets connection created: ' + socket.url);
                 plt.restyle(values);
               });
-            </script> {% endblock script %}
  No newline at end of file
+            </script> {% endblock script %}

plotter/views.py +3 -3

             def main(request, tag=None):
                 kwargs = {}
-                date = request.GET.get('date', datetime.utcnow().strftime('%d-%m-%Y'))
+                date = request.GET.get('date', datetime.now().strftime('%d-%m-%Y'))
                 exps = ExpDetail.objects(date=datetime.strptime(date, '%d-%m-%Y'))
                 tmp = {}
                 realtime = False
                 date = request.GET.get('date', None)
                 if date is None:
-                    date = datetime.utcnow().strftime('%d-%m-%Y')
+                    date = datetime.now().strftime('%d-%m-%Y')
                     realtime = True
                 exp = Experiment.objects.get(code=int(code))
                 detail = ExpDetail.objects.get(experiment=exp, date=datetime.strptime(date, '%d-%m-%Y'))
                 data = skynoise_plot(date.year, date.month, date.day)
                 response = HttpResponse(data.getvalue(), content_type='image/png')
-                return response
  No newline at end of file
+                return response

realtime/settings.py +4 -2

                 },
             ]
-            WSGI_APPLICATION = 'realtime.wsgi.application'
+            # WSGI_APPLICATION = 'realtime.wsgi.application'
             # Database
             # https://docs.djangoproject.com/en/1.11/howto/static-files/
             STATIC_URL = '/static/'
+            STATIC_ROOT = '/static/'
             #======================== YONG ================================
             host = os.environ.get('HOST_REDIS', '127.0.0.1')
+            ASGI_APPLICATION = 'realtime.asgi.application'
             CHANNEL_LAYERS = {
                 "default": {
                     'BACKEND': 'channels_redis.core.RedisChannelLayer',
                 },
             }
-            ASGI_APPLICATION = "realtime.routing.application"

requirements.txt +2 -1

             simplejson
             numpy
             matplotlib
-            scipy
  No newline at end of file
+            scipy
+            gunicorn

scripts/experiments.json +6 -2

                     "name" : "JULIA Bistatic"
                 },
                 {
+                    "code" : 210,
+            	"name" : "High Altitude Drift"
+                },
+                {
                     "code" : 230,
                     "name" : "Valley Bottonside 150 Km"
                 },
                 {
                     "code" : 240,
-                    "name" : "Simone Oyon"
+                    "name" : "Simone Ancon"
                 },
                 {
                     "code" : 241,
                 },
                 {
                     "code" : 244,
-                    "name" : "Simone Ancon"
+                    "name" : "Simone Chaclacayo"
                 }
             ]

scripts/server.py +5 -2

             #============== funcion para modificar datos en la tabla ==============
             def update(buffer):
-                dt = datetime.utcfromtimestamp(buffer['time'])
+                dt = datetime.fromtimestamp(buffer['time'])
                 interval = buffer['metadata'].pop('interval')
                 tag = buffer['metadata'].pop('tag') if 'tag' in buffer['metadata'] else ''
                 exp = Experiment.objects.get(code=buffer['code'])
                 while True:
-                    buffer = receiver.recv_json()
+                    try:
+                        buffer = receiver.recv_json()
+                    except:
+                        continue
                     if not isinstance(buffer, dict):
                         print('Invalid data received: {}').format(str(buffer))
                         continue

utils/TimeTools.py +1 -1

                     Converts datetime to number of seconds respect to 1970.
                     """
-                    dtime = dt(self.year, self.month, self.dom)
+                    dtime = dt(self.year[0], self.month[0], self.dom[0])
                     return (dtime-dt(1970, 1, 1)).total_seconds()
                     year = self.year

realtime/routing.py removed 0 -11

NO CONTENT: file was removed

	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