realtime_web Commit - r1:f2324aa7e45d

Docker working

Juan C. Espinoza -

r1:f2324aa7e45d

parent child

Context file:

r1:f2324aa7e45d

.env created 644 +2 0

@@ -0,0 +1,2
	1	HOST_MONGO=mongo
	2	HOST_REDIS=redis No newline at end of file

Dockerfile +6 -1

              RUN mkdir /app
              WORKDIR /app
              ADD requirements.txt ./requirements.txt
-             RUN pip install -r requirements.txt
+             RUN apt-get clean && apt-get update && apt-get install -y --no-install-recommends \
+            	g++ \
+            	gcc \
+                && pip install -r requirements.txt \
+                && apt-get purge -y --auto-remove gcc g++\
+            	&& rm -rf /var/lib/apt/lists/*
              COPY . /app/
   No newline at end of file

docker-compose.yml +9 -1

             services:
               web:
+                container_name: 'realtime_web'
                 build: .
                 image: realtime
                 command: python manage.py runserver 0.0.0.0:8000
+                env_file: .env
                 ports:
                   - "8000:8000"
                 links:
                   - redis
                   - mongo
+                volumes:
+                  - './:/app'
                 depends_on:
                   - redis
                   - mongo
               zmq_server:
+                container_name: 'zmq_server'
                 image: 'realtime'
                 ports:
                   - '127.0.0.1:4444:4444'
-                command: 'python scripts/server.py'
+                command: 'python -u scripts/server.py'
+                env_file: .env
                 links:
                   - redis
                   - mongo
+                volumes:
+                  - './:/app'
                 depends_on:
                   - web

plotter/consumers.py +6 -8

+            import os
             import json
             import numpy as np
             from datetime import datetime
-            import mongoengine
             from pymongo import MongoClient
             from models import Experiment, Data
             from channels.auth import channel_session_user
             from channels import Group
-            from profilehooks import profile
+            host = os.environ.get('HOST_MONGO', 'localhost')
+            CLIENT = MongoClient('{}:27017'.format(host))
-            # mongoengine.connect('dbplots')
-            CLIENT = MongoClient('mongo:27017')
             DB = CLIENT['dbplots']
             # Connected to websocket.connect
                         datas = DB.data.find({'experiment': e['_id']}, ['time', 'data']).sort('time', 1)
                         dum = [(d['time'], d['data'][plot]) for d in datas]
                         e['time'] = [d[0] for d in dum]
-                        dum = np.array([d[1] for d in dum])
+                        dum = [d[1] for d in dum]
-                        e[plot] = np.swapaxes(dum, 0, 1).tolist()
+                        e[plot] = map(list, zip(*dum))
                     e.pop('date', None)
                     e.pop('_id', None)
                     message.reply_channel.send({'text': json.dumps(e)})

plotter/views.py +11 -2

             # -*- coding: utf-8 -*-
             from __future__ import unicode_literals
+            import os
             from datetime import datetime
             from django import forms
             from pymongo import MongoClient
-            CLIENT = MongoClient('mongo:27017')
+            host = os.environ.get('HOST_MONGO', 'localhost')
+            CLIENT = MongoClient('{}:27017'.format(host))
             DB = CLIENT['dbplots']
             # Forms
                 if plot is not None:
                     initial['plot'] = plot
+                print 'hola'
                 codes = DB.experiment.find().distinct('code')
+                print codes
                 exps = [DB.experiment.find_one({'code': c}, ['name']) for c in codes]
+                print exps
                 names = [q['name'] for q in exps]
+                print names
                 form = SearchForm(
                     initial = initial,
                     exp_choices = [(e[0], e[1]) for e in zip(codes, names)]
                     'form': form,
                 }
-                if codes:
+                if code and codes:
                     kwargs['title'] = [t[1] for t in zip(codes, names) if t[0]==int(code)][0]
+                else:
+                    kwargs['title'] = 'JRO'
                 if plot == 'rti':
                     return render(request, 'rti.html', kwargs)

realtime/settings.py +3 -1

             STATIC_URL = '/static/'
+            host = os.environ.get('HOST_REDIS', 'localhost')
             CHANNEL_LAYERS = {
                 "default": {
                     "BACKEND": "asgi_redis.RedisChannelLayer",
                     "CONFIG": {
-                        "hosts": [("redis", 6379)],
+                        "hosts": [(host, 6379)],
                     },
                     "ROUTING": "realtime.routing.channel_routing",
                 },

requirements.txt +1 -1

             Django==1.11.7
             django-bootstrap3==9.1.0
             django-bootstrap3-datetimepicker-2==2.5.0
-            django-channels==0.7.0
+            channels==1.1.8
             mongoengine==0.15.0
             numpy==1.13.3
             pymongo==3.5.1

scripts/server.py +11 -5

             from plotter.models import Experiment, Data
-            mongoengine.connect('dbplots', host='mongo', port=27017)
+            host_mongo = os.environ.get('HOST_MONGO', 'localhost')
+            mongoengine.connect('dbplots', host=host_mongo, port=27017)
+            host_redis = os.environ.get('HOST_REDIS', 'localhost')
+            channel = asgi_redis.RedisChannelLayer(hosts=[(host_redis, 6379)])
             context = zmq.Context()
             receiver = context.socket(zmq.SUB)
-            receiver.bind("tcp://127.0.0.1:4444")
+            receiver.bind("tcp://0.0.0.0:4444")
             receiver.setsockopt(zmq.SUBSCRIBE, '')
-            channel = asgi_redis.RedisChannelLayer(hosts=[('redis', 6379)])
             def update_db(buffer):
                 dt = datetime.utcfromtimestamp(buffer['time'])
                     new = False
                 return new
-            print 'Waiting for messages...'
+            print 'Starting...'
             while True:
                 buffer = receiver.recv_json()
                 if 'xrange' not in buffer:
                     buffer['xrange'] = []

General Comments 0

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

No TODOs yet

	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