Changeset 8624 for mauRepo

Timestamp:

10/10/12 13:41:45 (7 years ago)

Author:

mnagni

Message:

Complete - # 22566: Add Related Party type and indexing to new JSON object
 http://team.ceda.ac.uk/trac/ceda/ticket/22566
Complete - # 22562: CEDA MOLES3 Bug Report: Publication time missing
 http://team.ceda.ac.uk/trac/ceda/ticket/22562
Complete - # 22567: CEDA MOLES3 Bug Report: Info DB connection check needed
 http://team.ceda.ac.uk/trac/ceda/ticket/22567

File:

• mauRepo/MolesManager/trunk/cedaMoles/MolesManager/molesSessionMiddleware.py (modified) (4 diffs)

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/molesSessionMiddleware.py

@@ -43 +43 @@
 from django.shortcuts import render_to_response
 from cedaMoles import __version__, __revision__
+from logging import StreamHandler
+import logging
+
+log = logging.getLogger('MolesSessionMiddleware')
+log.addHandler(StreamHandler())
+log.setLevel(logging.INFO) 
 
 def assemble_version():
@@ -64 +70 @@
     
     def _doInitialization(self):
-
-        infoDB = DbManager(INFO_DB_CONNECTION)
-        MolesSessionMiddleware._infodbEPBFactory = InfodbEPBFactory(infoDB)
+        start_migration = False
+        try:
+            infoDB = DbManager(INFO_DB_CONNECTION)
+            MolesSessionMiddleware._infodbEPBFactory = InfodbEPBFactory(infoDB)
+            start_migration = True
+        except Exception:
+            log.info("Cannot initialize infoDB. The migration process will not start \
+however the application will continue to browse the existing database.")
            
         migrationDB = DbManager(MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT)
@@ -74 +85 @@
         MolesSessionMiddleware._moles3EPBFactory = Moles3EPBFactory(molesDB)
         
+        MolesSessionMiddleware._epbInitialized = True
+        
+        if not start_migration:
+            return
+        
         MolesSessionMiddleware._migrationThread = MigrationThread( \
             MolesSessionMiddleware._moles3EPBFactory.createEPB(), \
@@ -79 +95 @@
             MolesSessionMiddleware._infodbEPBFactory.createEPB(), \
             interval = MIGRATION_INTERVAL )
-        MolesSessionMiddleware._epbInitialized = True      
+              
             
         _migration()