Use separate loggers per module instead of common.log.

The separate names assist in debugging.

timesearch_modules/common.py

@@ -4,6 +4,8 @@ import os
 import time
 import traceback
 
+from voussoirkit import vlogging
+
 VERSION = '2020.09.06.0'
 
 try:
@@ -30,7 +32,7 @@ if bot is None or bot.praw != praw:
         raise ImportError(message)
 
 
-log = logging.getLogger('timesearch')
+log = vlogging.get_logger(__name__)
 
 r = bot.anonymous()
 

timesearch_modules/livestream.py

@@ -7,6 +7,9 @@ from . import common
 from . import exceptions
 from . import tsdb
 
+from voussoirkit import vlogging
+
+log = vlogging.get_logger(__name__)
 
 def _listify(x):
     '''
@@ -32,7 +35,7 @@ def generator_printer(generator):
         clear_prev = (' ' * prev_message_length) + '\r'
         print(clear_prev + status, end='')
         prev_message_length = len(status)
-        if totalnew == 0 and common.log.level != common.logging.DEBUG:
+        if totalnew == 0 and log.level == 0 or log.level > vlogging.DEBUG:
             # Since there were no news, allow the next line to overwrite status
             print('\r', end='', flush=True)
         else:
@@ -131,13 +134,13 @@ def _livestream_as_a_generator(
     common.login()
 
     if subreddit:
-        common.log.debug('Getting subreddit %s', subreddit)
+        log.debug('Getting subreddit %s', subreddit)
         (database, subreddit) = tsdb.TSDB.for_subreddit(subreddit, fix_name=True)
         subreddit = common.r.subreddit(subreddit)
         submission_function = subreddit.new if do_submissions else None
         comment_function = subreddit.comments if do_comments else None
     else:
-        common.log.debug('Getting redditor %s', username)
+        log.debug('Getting redditor %s', username)
         (database, username) = tsdb.TSDB.for_user(username, fix_name=True)
         user = common.r.redditor(username)
         submission_function = user.submissions.new if do_submissions else None
@@ -180,16 +183,16 @@ def _livestream_helper(
     results = []
 
     if submission_function:
-        common.log.debug('Getting submissions %s %s', args, kwargs)
+        log.debug('Getting submissions %s %s', args, kwargs)
         this_kwargs = copy.deepcopy(kwargs)
         submission_batch = submission_function(*args, **this_kwargs)
         results.extend(submission_batch)
     if comment_function:
-        common.log.debug('Getting comments %s %s', args, kwargs)
+        log.debug('Getting comments %s %s', args, kwargs)
         this_kwargs = copy.deepcopy(kwargs)
         comment_batch = comment_function(*args, **this_kwargs)
         results.extend(comment_batch)
-    common.log.debug('Got %d posts', len(results))
+    log.debug('Got %d posts', len(results))
     return results
 
 def livestream_argparse(args):

timesearch_modules/pushshift.py

@@ -15,6 +15,9 @@ import traceback
 from . import common
 
 from voussoirkit import ratelimiter
+from voussoirkit import vlogging
+
+log = vlogging.get_logger(__name__)
 
 print('Thank you Jason Baumgartner of Pushshift.io!')
 
@@ -122,7 +125,7 @@ def _pagination_core(url, params, dummy_type, lower=None, upper=None):
             else:
                 break
 
-        common.log.debug('Got batch of %d items.', len(batch))
+        log.debug('Got batch of %d items.', len(batch))
         batch_ids = setify(batch)
         if len(batch_ids) == 0 or batch_ids.issubset(prev_batch_ids):
             break
@@ -141,13 +144,13 @@ def _initialize_ratelimiter():
     global ratelimit
     if ratelimit is not None:
         return
-    common.log.debug('Initializing pushshift ratelimiter.')
+    log.debug('Initializing pushshift ratelimiter.')
     url = 'https://api.pushshift.io/meta'
     response = session.get(url)
     response.raise_for_status()
     response = response.json()
     limit = response['server_ratelimit_per_minute']
-    common.log.debug('Pushshift ratelimit is %d items per minute.', limit)
+    log.debug('Pushshift ratelimit is %d requests per minute.', limit)
     ratelimit = ratelimiter.Ratelimiter(allowance=limit, period=60)
 
 def get(url, params=None):
@@ -161,7 +164,7 @@ def get(url, params=None):
     for (key, val) in DEFAULT_PARAMS.items():
         params.setdefault(key, val)
 
-    common.log.debug('Requesting %s with %s', url, params)
+    log.debug('Requesting %s with %s', url, params)
     ratelimit.limit()
     response = session.get(url, params=params)
     response.raise_for_status()
@@ -238,7 +241,7 @@ def supplement_reddit_data(dummies, chunk_size=100):
     '''
     chunks = common.generator_chunker(dummies, chunk_size)
     for chunk in chunks:
-        common.log.debug('Supplementing %d items with live reddit data.', len(chunk))
+        log.debug('Supplementing %d items with live reddit data.', len(chunk))
         ids = [item.fullname for item in chunk]
         live_copies = list(common.r.info(ids))
         live_copies = {item.fullname: item for item in live_copies}

timesearch_modules/tsdb.py

@@ -9,7 +9,9 @@ from . import pushshift
 
 from voussoirkit import pathclass
 from voussoirkit import sqlhelpers
+from voussoirkit import vlogging
 
+log = vlogging.get_logger(__name__)
 
 # For backwards compatibility reasons, this list of format strings will help
 # timesearch find databases that are using the old filename style.
@@ -324,7 +326,7 @@ class TSDB:
     def insert(self, objects, commit=True):
         if not isinstance(objects, (list, tuple, types.GeneratorType)):
             objects = [objects]
-        common.log.debug('Trying to insert %d objects.', len(objects))
+        log.debug('Trying to insert %d objects.', len(objects))
 
         new_values = {
             'tsdb': self,
@@ -346,10 +348,10 @@ class TSDB:
             new_values[key] += status
 
         if commit:
-            common.log.debug('Committing insert.')
+            log.debug('Committing insert.')
             self.sql.commit()
 
-        common.log.debug('Done inserting.')
+        log.debug('Done inserting.')
         return new_values
 
     def insert_edited(self, obj, old_text):