Merge branch 'master' into development

.travis.yml

@@ -2,9 +2,8 @@ language: python
 python:
   - "3.5"
   - "3.6"
-  - "3.7-dev"  # 3.7 development branch
 install:
   - pip install -r requirements.txt
   - coilmq&
 script:
-  - pytest
+- pytest tests

README.md

@@ -1,5 +1,9 @@
 # LAKEsuperior
 
+[![build status](
+  http://img.shields.io/travis/scossu/lakesuperior/master.svg?style=flat)](
+ https://travis-ci.org/username/repo)
+
 LAKEsuperior is an alternative [Fedora Repository](http://fedorarepository.org)
 implementation.
 

docker/etc/application.yml

@@ -87,11 +87,14 @@ messaging:
           # for this route.
           active: True
 
+          # Protocol version. One of `10`, `11` or `12`.
+          protocol: '11'
           host: 127.0.0.1
           port: 61613
+
+          # Credentials are optional.
           username:
           password:
-          protocol: '12'
           destination: '/topic/fcrepo'
 
           # Message format: at the moment the following are supported:

fcrepo

@@ -2,4 +2,4 @@
 default_conf_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/etc.defaults"
 conf_dir=${FCREPO_CONFIG_DIR:-$default_conf_dir}
 
-gunicorn -c "${conf_dir}/gunicorn.py" server:fcrepo
+gunicorn -c "${conf_dir}/gunicorn.py" server:fcrepo --preload

lakesuperior/messaging/handlers.py

@@ -14,9 +14,9 @@ class StompHandler(logging.Handler):
     def __init__(self, conf):
         self.conf = conf
         if self.conf['protocol'] == '11':
-            conn_cls = stomp.Connection12
-        elif self.conf['protocol'] == '12':
             conn_cls = stomp.Connection11
+        elif self.conf['protocol'] == '12':
+            conn_cls = stomp.Connection12
         else:
             conn_cls = stomp.Connection10
 

requirements.txt

@@ -10,6 +10,7 @@ gunicorn==19.7.1
 lmdb==0.93
 numpy==1.14.1
 pytest==3.2.2
+pytest-flask==0.10.0
 rdflib==4.2.2
 requests-toolbelt==0.8.0
 requests==2.18.4