Merge pull request #2069 from edx/ned/minor-startup-fixes

Very Minor tweaks to the LMS and CMS startup.

cms/startup.py

 """
 Module with code executed during Studio startup
 """
-import logging
 from django.conf import settings
 
 # Force settings to run so that the python path is modified
@@ -9,7 +8,6 @@ settings.INSTALLED_APPS  # pylint: disable=W0104
 
 from django_startup import autostartup
 
-log = logging.getLogger(__name__)
 
 # TODO: Remove this code once Studio/CMS runs via wsgi in all environments
 INITIALIZED = False

common/lib/django_startup.py

+"""
+Automatic execution of startup modules in Django apps.
+"""
+
 from importlib import import_module
 from django.conf import settings
 
@@ -6,9 +10,12 @@ def autostartup():
     Execute app.startup:run() for all installed django apps
     """
     for app in settings.INSTALLED_APPS:
+        # See if there's a startup module in each app.
         try:
             mod = import_module(app + '.startup')
-            if hasattr(mod, 'run'):
-                mod.run()
         except ImportError:
             continue
+
+        # If the module has a run method, run it.
+        if hasattr(mod, 'run'):
+            mod.run()

lms/startup.py

 """
 Module for code that should run during LMS startup
 """
-import logging
 
 from django.conf import settings
 
@@ -11,7 +10,6 @@ settings.INSTALLED_APPS  # pylint: disable=W0104
 from django_startup import autostartup
 from xmodule.modulestore.django import modulestore
 
-log = logging.getLogger(__name__)
 
 def run():
     """
@@ -19,8 +17,8 @@ def run():
     """
     autostartup()
 
-    # Trigger a forced initialization of our modulestores since this can take a while to complete
-    # and we want this done before HTTP requests are accepted.
+    # Trigger a forced initialization of our modulestores since this can take a
+    # while to complete and we want this done before HTTP requests are accepted.
     if settings.INIT_MODULESTORE_ON_STARTUP:
         for store_name in settings.MODULESTORE:
             modulestore(store_name)