Update version number

README.md

@@ -9,7 +9,7 @@ Shared Solar server
 $ python3.6 -m venv venv
 $ source venv/bin/activate
 (venv) $ pip install -r requirements.txt -r dev/requirements.txt
-(venv) $ ./dev/run.sh 
+(venv) $ ./dev/run.sh
 [I 170329 16:07:16 server:28] Debug mode is on
 Listening on port 8888
 [I 170329 16:07:16 server:50] Application started
@@ -24,7 +24,7 @@ $ docker-compose -f dev/docker-compose.yml ps
 --------------------------------------------------------------------------------
 dev_db_1         docker-entrypoint.sh postgres    Up      5432/tcp               
 dev_minigrid_1   ./dev/run.sh --db_host=db  ...   Up      0.0.0.0:8888->8888/tcp 
-dev_redis_1      docker-entrypoint.sh redis ...   Up      6379/tcp
+dev_redis_1      docker-entrypoint.sh redis ...   Up      6379/tcp               
 ```
 
 

minigrid/handlers.py

@@ -526,7 +526,7 @@ def _pack_into_dict(session, binary):
         message = block[1:]
         result[block_id] = message.hex()
     minigrid_id = str(UUID(unhexlify(result[6]).decode('ascii')))
-    minigrid = models.get_minigrid(session, minigrid_id)
+    minigrid = models.get_minigrid(session, minigrid_id, None)
     key = minigrid.aes_key
     cipher = Cipher(AES(key), modes.ECB(), backend=default_backend())
     for block_index, value in result.items():
@@ -560,6 +560,8 @@ def post(self):
         device_address = unhexlify(binary[:12])  # TODO: deal with multi-user -- exclusive lock?
         body = binary[12:]
         cache.set('device_active', 1, 5)
+        if len(body) == 0:
+            return
         payload = _pack_into_dict(self.session, body)
         cache.set('received_info', payload, 5)
         device_info = cache.get('device_info')

prod/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   minigrid:
-    image: selcolumbia/minigrid-server:0.1.6-dev13
+    image: selcolumbia/minigrid-server:0.1.6-dev14
     command: ./prod/run.sh --db_host=db --redis_url=redis://redis:6379/0 --minigrid-website-url=https://www.example.com
     depends_on:
       - redis

prod/install.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-# Minigrid Server installer for version 0.1.6-dev13
+# Minigrid Server installer for version 0.1.6-dev14
 set -e
 
 # Do you have docker installed?
@@ -108,8 +108,8 @@ $SUDO openssl dhparam -out /etc/letsencrypt/live/$LETSENCRYPT_DIR/dhparam.pem 20
 printf "========================================\n"
 printf " Generating configuration               \n"
 printf "========================================\n"
-$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.1.6-dev13/prod/docker-compose.yml > docker-compose.yml
-$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.1.6-dev13/prod/nginx.conf > nginx.conf
+$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.1.6-dev14/prod/docker-compose.yml > docker-compose.yml
+$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.1.6-dev14/prod/nginx.conf > nginx.conf
 
 sed -i s/www.example.com/$LETSENCRYPT_DIR/g docker-compose.yml
 sed -i s/www.example.com/$LETSENCRYPT_DIR/g nginx.conf