-> Logging fixes

-> Fix for VolView URIs

Author: s-paquette

etl/etl.py

@@ -48,7 +48,7 @@
 from django.contrib.auth.models import User
 idc_superuser = User.objects.get(username="idc")
 
-logger = logging.getLogger('main_logger')
+logger = logging.getLogger(__name__)
 
 ATTR_SET = {}
 DISPLAY_VALS = {}

idc/demo_views.py

@@ -42,7 +42,7 @@
 from django.utils.html import escape
 
 debug = settings.DEBUG
-logger = logging.getLogger('main_logger')
+logger = logging.getLogger(__name__)
 
 BQ_ATTEMPT_MAX = 10
 WEBAPP_LOGIN_LOG_NAME = settings.WEBAPP_LOGIN_LOG_NAME

idc/domain_redirect_middleware.py

@@ -19,7 +19,7 @@
 from django.http import HttpResponsePermanentRedirect
 from django.conf import settings
 
-logger = logging.getLogger('main_logger')
+logger = logging.getLogger(__name__)
 
 
 class DomainRedirectMiddleware(object):

idc/metadata_utils.py

@@ -18,7 +18,7 @@
 from idc_collections.models import Attribute
 from django.conf import settings
 
-logger = logging.getLogger('main_logger')
+logger = logging.getLogger(__name__)
 
 
 def retTuple(x, order_docs):

idc/models.py

@@ -19,7 +19,7 @@
 
 import logging
 
-logger = logging.getLogger('main_logger')
+logger = logging.getLogger(__name__)
 
 
 class AppInfo(models.Model):

idc/templatetags/custom_tags.py

@@ -38,7 +38,7 @@
 
 register = template.Library()
 
-logger = logging.getLogger('main_logger')
+logger = logging.getLogger(__name__)
 
 # If an attribute's values should be alphanumerically sorted, list them here
 ALPHANUM_SORT = [

idc/validators.py

@@ -7,7 +7,7 @@
 
 import re
 
-logger = logging.getLogger('main_logger')
+logger = logging.getLogger(__name__)
 
 
 class PasswordReuseValidator:

idc/views.py

@@ -48,7 +48,7 @@
 
 
 debug = settings.DEBUG
-logger = logging.getLogger('main_logger')
+logger = logging.getLogger(__name__)
 
 BQ_ATTEMPT_MAX = 10
 WEBAPP_LOGIN_LOG_NAME = settings.WEBAPP_LOGIN_LOG_NAME
@@ -399,6 +399,7 @@ def populate_tables(request):
         sortdir = req.get('sortdir', 'asc')
 
         [cnt, tableRes]=get_table_data_with_cart_data(table_type, sort, sortdir, filters, filtergrp_list, partitions, limit, offset, table_search)
+
         response["res"] = tableRes
         response["cnt"] = cnt
         response["diff"] = []
@@ -812,7 +813,6 @@ def explore_data_page(request, filter_path=False, path_filters=None):
         fields = json.loads(req.get('fields', '[]'))
         order_docs = json.loads(req.get('order_docs', '[]'))
         counts_only = (req.get('counts_only', "true").lower() == "true")
-        print("Explore data page call, counts only: {}".format(counts_only))
         with_related = (req.get('with_clinical', "True").lower() == "true")
         with_derived = (req.get('with_derived', "True").lower() == "true")
         collapse_on = req.get('collapse_on', 'SeriesInstanceUID')

idc/views_api.py

@@ -26,7 +26,7 @@
 from django.http import HttpResponse, JsonResponse
 
 debug = settings.DEBUG
-logger = logging.getLogger('main_logger')
+logger = logging.getLogger(__name__)
 from datetime import datetime
 
 from django.views.decorators.csrf import csrf_exempt

scripts/create_prior_version_cohorts.py

@@ -33,7 +33,7 @@
 from cohorts.utils import _save_cohort
 from idc_collections.models import ImagingDataCommonsVersion, Attribute
 
-logger = logging.getLogger('main_logger')
+logger = logging.getLogger(__name__)
 
 COHORT_DEFS_EXAMPLE = [
     # {