From 23abb0955ea3587750c41e5b912a6e66f0b0e870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Thu, 19 Nov 2020 20:34:38 +0100
Subject: [PATCH] ... travis fix

---
 .travis.yml             | 33 ++++++++++++++++++++++++++++-----
 app/commands/gateway.py |  5 ++++-
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c16c0e6..fe2dc08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,39 @@
 sudo: false
 language: python
 
+services:
+  - redis
+  - postgresql
+
+addons:
+  postgresql: "11.2"
+
+before_install:
+  - sudo service postgresql stop
+  - sudo apt-get update
+  - sudo apt-get remove -y postgresql\*
+  - sudo apt-get install postgresql-11-postgis-2.5 postgresql-client
+  - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf
+  - sudo cp /etc/postgresql/{9.6,11}/main/pg_hba.conf
+  - sudo service postgresql start 11
+
 install:
+  - pip install --upgrade pip
   - pip install tox
 
 before_script:
+  - sudo add-apt-repository ppa:timescale/timescaledb-ppa -y
+  - sudo apt-get update -q
+  - sudo apt-get install -y timescaledb-postgresql-11 timescaledb-tools
+  - sudo timescaledb-tune -yes -pg-version 11
+  - sudo service postgresql restart 11
   - psql -U postgres -c 'CREATE DATABASE ogn_test;'
   - psql -U postgres -c 'CREATE EXTENSION postgis;'
 
 script:
   - tox
 
-addons:
-  postgresql: 9.6
-  apt:
-    packages:
-      - postgresql-9.6-postgis-2.4
+
 
 matrix:
   include:
@@ -28,3 +46,8 @@ matrix:
 
 after_success:
   - tox -e codecov
+
+after_failure:
+  - echo "Job failed..."
+  - sudo cat /var/log/syslog
+  - psql --version
diff --git a/app/commands/gateway.py b/app/commands/gateway.py
index 65701e3..b771c34 100644
--- a/app/commands/gateway.py
+++ b/app/commands/gateway.py
@@ -26,6 +26,9 @@ def run(aprs_filter):
     Run the aprs client, parse the incoming data and put it to redis.
     """
 
+    import logging
+    logging.basicConfig(level=logging.INFO, format='%(asctime)s %(name)-17s %(levelname)-8s %(message)s')
+
     current_app.logger.warning("Start ogn gateway")
     client = AprsClient(current_app.config['APRS_USER'], aprs_filter)
     client.connect()
@@ -62,7 +65,7 @@ def run(aprs_filter):
 
         current_minute = datetime.utcnow().minute
         if current_minute != insert_into_redis.last_minute:
-            current_app.logger.warning(f"{insert_into_redis.beacon_counter:7d}")
+            current_app.logger.info(f"{insert_into_redis.beacon_counter:7d}/min")
             insert_into_redis.beacon_counter = 0
         insert_into_redis.last_minute = current_minute