cleanup logging

modispds/__init__.py

@@ -1,5 +1 @@
-import logging
 
-logger = logging.getLogger(__name__)
-#logger.addHandler(logging.StreamHandler())
-logger.setLevel(logging.DEBUG)

modispds/cmr.py

@@ -25,7 +25,7 @@
 cmr = CMR(os.path.join(os.path.dirname(__file__), 'cmr.cfg'))
 
 # logging
-log = logging.getLogger(__name__)
+logger = logging.getLogger(__name__)
 
 
 def query(start_date, end_date, product='MCD43A4.006', provider='LPDAAC_ECS'):
@@ -50,7 +50,7 @@ def query(start_date, end_date, product='MCD43A4.006', provider='LPDAAC_ECS'):
         date = parse(dt) + datetime.timedelta(days=products[product]['day_offset'])
         if (start_date <= date <= end_date):
             granules.append(gran)
-    log.debug("%s granules found within %s - %s" % (len(granules), start_date.date(), end_date.date()))
+    logger.info("%s granules found within %s - %s" % (len(granules), start_date.date(), end_date.date()))
     return granules
 
 
@@ -63,7 +63,7 @@ def download_granule(meta, outdir=''):
     # save metadata
     fn_meta = os.path.join(outdir, bname + '_meta.json')
     with open(fn_meta, 'w') as f:
-        log.info('Writing metadata to %s' % fn_meta)
+        logger.debug('Writing metadata to %s' % fn_meta)
         dump(meta, f, sort_keys=True, indent=4, ensure_ascii=False)
 
     # download hdf
@@ -91,7 +91,7 @@ def download_file(url, noauth=False, outdir=''):
     chunk_size = 1024
     try:
         with open(fout, 'wb') as f:
-            log.info('Saving %s' % fout)
+            logger.debug('Saving %s' % fout)
             for chunk in stream.iter_content(chunk_size):
                 f.write(chunk)
     except:

modispds/main.py

@@ -11,7 +11,14 @@
 from modispds.version import __version__
 from modispds.products import products
 
-logger = logging.getLogger('modispds')
+# quiet these loggers
+logging.getLogger('boto3').setLevel(logging.CRITICAL)
+logging.getLogger('botocore').setLevel(logging.CRITICAL)
+logging.getLogger('nose').setLevel(logging.CRITICAL)
+logging.getLogger('requests').setLevel(logging.CRITICAL)
+
+logging.basicConfig(level=logging.DEBUG)
+logger = logging.getLogger(__name__)
 
 # default product
 _PRODUCT = 'MCD43A4.006'
@@ -100,7 +107,7 @@ def convert_to_geotiff(hdf, outdir=''):
     # save each band as a TIF
     for i, band in enumerate(img):
         fname = os.path.join(outdir, bname.replace('.hdf', '') + '_' + bandnames[i] + '.TIF')
-        logger.info('Writing %s' % fname)
+        logger.debug('Writing %s' % fname)
         imgout = img.select([i+1]).save(fname, options=opts)
         file_names.append(fname)
         # add overview as separate file

modispds/pds.py

@@ -28,7 +28,6 @@ def make_index(thumb, product, files):
     html = template.render(thumb=thumb, product=product, files=sorted(files))
     index_fname = 'index.html'
     with open(index_fname, 'w') as outfile:
-        logger.info('Writing %s' % index_fname)
         outfile.write(html)
 
     return index_fname
@@ -58,7 +57,7 @@ def push_to_s3(filename, bucket, prefix=''):
 
     ext = os.path.splitext(filename)[1]
     with open(filename, 'rb') as f:
-        logger.info('Uploading %s to: %s' % (key, bucket))
+        logger.debug('Uploading %s to: %s' % (key, bucket))
         if ext == '.html':
             content_type = 'text/html'
         elif ext == '.json':
@@ -119,7 +118,7 @@ def del_from_s3(url):
         aws_access_key_id=AWS_ACCESS_KEY_ID,
         aws_secret_access_key=AWS_SECRET_ACCESS_KEY
     )
-    logger.info('Deleting %s' % url)
+    logger.debug('Deleting %s' % url)
     parts = splitall(url)
     bucket = parts[1]
     key = os.path.sep.join(parts[2:])

test/test_main.py

@@ -1,5 +1,4 @@
 import os
-import logging
 import unittest
 import datetime
 from dateutil.parser import parse
@@ -8,12 +7,6 @@
 from modispds.pds import s3_list, del_from_s3
 from modispds.products import products
 
-# quiet these loggers
-logging.getLogger('boto3').setLevel(logging.CRITICAL)
-logging.getLogger('botocore').setLevel(logging.CRITICAL)
-logging.getLogger('nose').setLevel(logging.CRITICAL)
-logging.getLogger('requests').setLevel(logging.CRITICAL)
-
 
 class TestMain(unittest.TestCase):
     """ Test query and downloading from CMR """