Minor Logging Issues

This patch fixes a few minor logging issues where exceptions were not
logged properly or the loggers own formatting was not used.

pyca/capture.py

@@ -23,7 +23,6 @@
 import subprocess
 import sys
 import time
-import traceback
 
 logger = logging.getLogger(__name__)
 notify = sdnotify.SystemdNotifier()
@@ -169,8 +168,7 @@ def recording_command(event):
         try:
             os.remove(preview.replace('{{previewdir}}', conf['preview_dir']))
         except OSError:
-            logger.warning('Could not remove preview files')
-            logger.warning(traceback.format_exc())
+            logger.warning('Could not remove preview files', exc_info=True)
 
     # Check process for errors
     exitcode = conf['exit_code']

pyca/ingest.py

@@ -18,7 +18,6 @@
 import sdnotify
 import shutil
 import time
-import traceback
 
 logger = logging.getLogger(__name__)
 notify = sdnotify.SystemdNotifier()
@@ -80,7 +79,7 @@ def ingest(event):
 
     # add track
     for (flavor, track) in event.get_tracks():
-        logger.info('Adding track ({0} -> {1})'.format(flavor, track))
+        logger.info('Adding track (%s -> %s)', flavor, track)
         track = track.encode('ascii', 'ignore')
         fields = [('mediaPackage', mediapackage), ('flavor', flavor),
                   ('BODY1', (pycurl.FORM_FILE, track))]
@@ -117,8 +116,7 @@ def safe_start_ingest(event):
     try:
         ingest(event)
     except Exception:
-        logger.error('Something went wrong during the upload')
-        logger.error(traceback.format_exc())
+        logger.exception('Something went wrong during the upload')
         # Update state if something went wrong
         recording_state(event.uid, 'upload_error')
         update_event_status(event, Status.FAILED_UPLOADING)

pyca/schedule.py

@@ -19,7 +19,6 @@
 import pycurl
 import sdnotify
 import time
-import traceback
 from urllib.parse import urlencode
 
 logger = logging.getLogger(__name__)
@@ -79,8 +78,7 @@ def get_schedule(db):
     try:
         cal = parse_ical(vcal.decode('utf-8'))
     except Exception:
-        logger.error('Could not parse ical')
-        logger.error(traceback.format_exc())
+        logger.exception('Could not parse ical')
         return
     db.query(UpcomingEvent).delete()
     for event in cal:

pyca/utils.py

@@ -123,8 +123,9 @@ def service(service_name, force_update=False):
             logger.debug('Updates service URL for %s: %s',
                          service_name,
                          config('services', service_id))
-        except pycurl.error as e:
-            logger.error(f'Could not get {service} endpoint: {e}. Retry in 5s')
+        except pycurl.error:
+            logger.exception('Could not get %s endpoint. Retry in 5s',
+                             service_name)
             time.sleep(5.0)
     return config('services', service_id)