Switches from flask development server to gunicorn for serving

Dockerfile

@@ -7,12 +7,13 @@ ENV WORKDIR /rpi-433rc
 RUN mkdir -p ${WORKDIR} && \
     cd ${WORKDIR}
 
-
 # Install rest-api wrapper for rpi-rf
 COPY . ${WORKDIR}
 RUN pip3 install -r ${WORKDIR}/requirements.txt
 # Setting correct entrypoint
-ENV FLASK_APP ${WORKDIR}/rpi433rc/app.py
+# ENV FLASK_APP ${WORKDIR}/rpi433rc/app.py
+ENV PYTHONPATH=${WORKDIR}
+ENV FLASK_MODULE=rpi433rc.app:app
 
 # Re-copy the entrypoint.sh to the root
 COPY ./entrypoint.sh /entrypoint.sh

Makefile

@@ -25,8 +25,11 @@ clean-build:
 
 clean: clean-pyc clean-build
 
+pin:
+		pip-compile --output-file requirements.txt requirements.in
+
 lint:
-		flake8 --exclude=.tox --max-line-length 120 $(SOURCE_PATH)
+		flake8 --exclude=.tox --max-line-length 120 --ignore=E402 $(SOURCE_PATH)
 
 test:
 		pytest --verbose --color=yes -s \
@@ -36,3 +39,6 @@ test:
 
 doctest:
 		pytest --verbose --color=yes --doctest-modules $(SOURCE_PATH)
+
+gunicorn:
+		gunicorn --bind 0.0.0.0:5000 wsgi

entrypoint.sh

@@ -6,7 +6,7 @@ case ${1} in
       exec rpi-rf_receive "$@"
       ;;
     serve)
-      exec flask run --host=0.0.0.0
+      exec gunicorn --workers 4 --bind 0.0.0.0:5000 ${FLASK_MODULE}
       ;;
     *)
       exec "$@"

requirements.in

@@ -1,5 +1,6 @@
 attrs
 flask
 flask-restplus
+gunicorn
 schema
 rpi-rf

requirements.txt

@@ -11,6 +11,7 @@ attrs==17.4.0
 click==6.7                # via flask
 flask-restplus==0.10.1
 flask==0.12.2
+gunicorn==19.9.0
 itsdangerous==0.24        # via flask
 jinja2==2.10              # via flask
 jsonschema==2.6.0         # via flask-restplus

rpi433rc/business/devices.py

@@ -138,8 +138,10 @@ class DeviceDict(DeviceStore):
         ...     'device2': {"system_code": "00010", "device_code": "2"}
         ... }
         >>> dut = DeviceDict(device_dict)
-        >>> sorted(dut.list(), key=lambda e: e.device_name)
-        [CodeDevice(device_name='device1', code_on=12345, code_off=23456), SystemDevice(device_name='device2', system_code='00010', device_code=2)]
+        >>> (sorted(dut.list(), key=lambda e: e.device_name) ==
+        ...     [CodeDevice(device_name='device1', code_on=12345, code_off=23456),
+        ...     SystemDevice(device_name='device2', system_code='00010', device_code=2)])
+        True
 
         >>> dut.lookup('device1')
         CodeDevice(device_name='device1', code_on=12345, code_off=23456)
@@ -154,8 +156,10 @@ class DeviceDict(DeviceStore):
         >>> with open(fn, 'w') as fp:
         ...     json.dump(device_dict, fp)
         >>> dut = DeviceDict.from_json(fn)
-        >>> sorted(dut.list(), key=lambda e: e.device_name)
-        [CodeDevice(device_name='device1', code_on=12345, code_off=23456), SystemDevice(device_name='device2', system_code='00010', device_code=2)]
+        >>> (sorted(dut.list(), key=lambda e: e.device_name) ==
+        ...     [CodeDevice(device_name='device1', code_on=12345, code_off=23456),
+        ...     SystemDevice(device_name='device2', system_code='00010', device_code=2)])
+        True
     """
     device_dict = attr.ib(validator=attr.validators.instance_of(dict))
     devices = attr.ib(default=None, repr=False, cmp=False, hash=False, init=False)
@@ -192,7 +196,7 @@ def _init_device(device_name, props):
             for dev in __ALL_DEVICES__:
                 try:
                     return dev.from_props(device_name, props)
-                except:
+                except (TypeError, ValueError):
                     # import traceback
                     # traceback.print_exc()
                     pass
@@ -332,11 +336,17 @@ class DeviceRegistry(DeviceStore, DeviceState):
         >>> dstate = MemoryState()  # Instantiate the device state
         >>> dut = DeviceRegistry(dstore, dstate)
 
-        >>> sorted(dut.list(), key=lambda e: e.device.device_name)
-        [StatefulDevice(device=CodeDevice(device_name='device1', code_on=12345, code_off=23456), state=False), StatefulDevice(device=SystemDevice(device_name='device2', system_code='00010', device_code=2), state=False)]
+        >>> (sorted(dut.list(), key=lambda e: e.device.device_name) ==
+        ...     [StatefulDevice(device=CodeDevice(device_name='device1', code_on=12345, code_off=23456), state=False),
+        ...     StatefulDevice(device=SystemDevice(device_name='device2', system_code='00010', device_code=2)
+        ...     , state=False)])
+        True
 
-        >>> dut.lookup('device1'), dut.switch('device1', True), dut.lookup('device1')
-        (StatefulDevice(device=CodeDevice(device_name='device1', code_on=12345, code_off=23456), state=False), None, StatefulDevice(device=CodeDevice(device_name='device1', code_on=12345, code_off=23456), state=True))
+        >>> ((dut.lookup('device1'), dut.switch('device1', True), dut.lookup('device1')) ==
+        ...     (StatefulDevice(device=CodeDevice(device_name='device1', code_on=12345, code_off=23456), state=False),
+        ...     None,
+        ...     StatefulDevice(device=CodeDevice(device_name='device1', code_on=12345, code_off=23456), state=True)))
+        True
 
     """
     device_store = attr.ib(validator=attr.validators.instance_of(DeviceStore))

rpi433rc/business/util.py

@@ -1,8 +1,5 @@
-import contextlib
 import logging
 
-import os
-
 
 class LogMixin(object):
     """

run.sh

@@ -1,5 +1,3 @@
 #!/usr/bin/env bash
 
-export FLASK_APP=`pwd`/rpi433rc/app.py
-
-flask run --host=0.0.0.0
+gunicorn --workers 4 --bind 0.0.0.0:5000 rpi433rc.app:app