summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristofer Hallin <kristofer@sunet.se>2021-10-13 08:49:41 +0200
committerKristofer Hallin <kristofer@sunet.se>2021-10-13 08:49:41 +0200
commitcd80cf3e00b76d8aa0b2819552525d7959e9dd1b (patch)
tree0d57cd05bd8d68a0ff899abe75361bcf673ad193
parent9b42192e54b409b7d6c1a12a8d802bc1edbaf37c (diff)
parentcf963db31d603abbd93ee56271a16603b525dad5 (diff)
Merge branch 'main' of git.sunet.se:soc_collector
-rw-r--r--README.md1
-rwxr-xr-xsrc/wsgi.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/README.md b/README.md
index 5876649..d4af5c0 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,7 @@ Start CouchDB and the collector. Make sure to give it a username and password:
export COUCHDB_USER=couchdb
export COUCHDB_PASSWORD=insecure
export COUCHDB_NAME=test
+ export COUCHDB_HOSTNAME=couchdb
docker-compose up
Now the database and the API server should be running, now we can try
diff --git a/src/wsgi.py b/src/wsgi.py
index 97965e1..62db3c9 100755
--- a/src/wsgi.py
+++ b/src/wsgi.py
@@ -75,7 +75,7 @@ class EPGet(CollectorResource):
selectors['domain'] = org
data = self._db.search(**selectors)
if data:
- out.append(data)
+ out += data
resp.text = json.dumps({'status': 'success', 'data': out})