diff options
| author | 2018-02-18 01:59:50 +0100 | |
|---|---|---|
| committer | 2018-02-18 01:59:50 +0100 | |
| commit | dac0822840ebe6672834a41b1065b3cbf17d217e (patch) | |
| tree | b288b2772c48cc3ccd0db9a74440f8bda7b49fe6 /pysite/database.py | |
| parent | Go back to using wss:// for the WS test (diff) | |
Simple logging.  (#16)
* Simple logging. I don't know if this will show up in the docker logs like inver wanted, so it probably needs testing in prod.
* log level via hasattr/getattr, basicConfig instead of custom handlers
* removing the empty string log call
Diffstat (limited to 'pysite/database.py')
| -rw-r--r-- | pysite/database.py | 12 | 
1 files changed, 7 insertions, 5 deletions
| diff --git a/pysite/database.py b/pysite/database.py index d3506062..589b77d1 100644 --- a/pysite/database.py +++ b/pysite/database.py @@ -1,6 +1,7 @@  # coding=utf-8 - +import logging  import os +  from typing import Any, Callable, Dict, Iterator, List, Optional, Union  from flask import abort @@ -16,6 +17,7 @@ class RethinkDB:          self.host = os.environ.get("RETHINKDB_HOST", "127.0.0.1")          self.port = os.environ.get("RETHINKDB_PORT", "28016")          self.database = os.environ.get("RETHINKDB_DATABASE", "pythondiscord") +        self.log = logging.getLogger()          self.conn = None          rethinkdb.set_loop_type(loop_type) @@ -23,9 +25,9 @@ class RethinkDB:          with self.get_connection(connect_database=False) as conn:              try:                  rethinkdb.db_create(self.database).run(conn) -                print(f"Database created: '{self.database}'") +                self.log.debug(f"Database created: '{self.database}'")              except rethinkdb.RqlRuntimeError: -                print(f"Database found: '{self.database}'") +                self.log.debug(f"Database found: '{self.database}'")      def get_connection(self, connect_database: bool=True) -> DefaultConnection:          """ @@ -82,7 +84,7 @@ class RethinkDB:              all_tables = rethinkdb.db(self.database).table_list().run(conn)              if table_name in all_tables: -                print(f"Table found: '{table_name}' ({len(all_tables)} tables in total)") +                self.log.debug(f"Table found: '{table_name}' ({len(all_tables)} tables in total)")                  return False              # Use a kwargs dict because the driver doesn't check the value @@ -99,7 +101,7 @@ class RethinkDB:              rethinkdb.db(self.database).table_create(table_name, **kwargs).run(conn) -            print(f"Table created: '{table_name}'") +            self.log.debug(f"Table created: '{table_name}'")              return True      def drop_table(self, table_name: str): | 
