From 2bdc6cf44f6c0c62862c4ac5da3a02ac0f7250d6 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Wed, 8 Feb 2017 17:16:45 +0100
Subject: use logging module

---
 api.py      | 11 ++++++-----
 crawler.py  |  3 ++-
 database.py |  5 +++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/api.py b/api.py
index 2ea8792..08b25fb 100644
--- a/api.py
+++ b/api.py
@@ -2,6 +2,7 @@
 
 import asyncio
 import os
+import logging
 
 import database
 import crawler
@@ -10,7 +11,6 @@ import crawler
 db = database.Database()
 
 
-# TODO use logging module instead of print
 async def crawl_region(region):
     """Gets some matches from a region and inserts them
        until the DB is up to date."""
@@ -30,16 +30,16 @@ async def crawl_region(region):
         except:
             last_match_update = "2017-02-05T01:01:01Z"
 
-        print(region + " fetching matches after " + last_match_update)
+        logging.info("%s: fetching matches since %s", region, last_match_update)
 
         # wait for http requests
         matches = await api.matches_since(last_match_update,
                                           region=region,
                                           params={"page[limit]": 50})
         if len(matches) > 0:
-            print(region + " got new data items: " + str(len(matches)))
+            logging.debug("%s: %s objects", region, len(matches))
         else:
-            print(region + " got no new matches.")
+            logging.debug("%s: no objects, stopping", region)
             return
         # insert asynchronously in the background
         await db.upsert(matches, True)
@@ -49,7 +49,7 @@ async def crawl_forever():
     """Gets the latest matches from all regions every 5 minutes."""
     # repeat forever
     while True:
-        print("getting recent matches")
+        logging.info("pulling recent matches")
 
         # TODO: insert API version (force update if changed)
         # TODO: create database indices
@@ -65,6 +65,7 @@ async def crawl_forever():
         await asyncio.sleep(300)
 
 
+logging.basicConfig(level=logging.DEBUG)
 loop = asyncio.get_event_loop()
 loop.run_until_complete(db.connect(
     host=os.environ["POSTGRESQL_HOST"],
diff --git a/crawler.py b/crawler.py
index dac2303..c21e535 100644
--- a/crawler.py
+++ b/crawler.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python
 
+import logging
 import asyncio
 import aiohttp
 
@@ -69,7 +70,6 @@ class Crawler(object):
             while True:
                 params["page[offset]"] += params["page[limit]"]
                 try:
-                    print("asking for more matches…")
                     res = await self._req(session,
                                           "shards/" + region + "/matches",
                                           params)
@@ -80,6 +80,7 @@ class Crawler(object):
 
                 if not forever:
                     break  # stop after one iteration
+                logging.debug("%s: asking for more matches", region)
 
         return data
 
diff --git a/database.py b/database.py
index 45467f6..ccb00bc 100644
--- a/database.py
+++ b/database.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 import asyncio
+import logging
 import json
 import asyncpg
 
@@ -18,14 +19,14 @@ class Database(object):
         """
         while True:  # retry until connection succeeds
             try:
-                print("attempting to connect to db…")
+                logging.warning("connecting to database")
                 self._pool = await asyncpg.create_pool(
                     host=host, port=port, user=user,
                     password=password, database=database)
                 break
             except asyncpg.exceptions.CannotConnectNowError:
                 await self._pool.close()
-                print("Database is not ready yet. Retrying…")
+                logging.error("database is not ready, retrying")
                 await asyncio.sleep(5)
 
 
-- 
cgit v1.3.1