- minor log formatting

GeoNode · Nov 14, 2018 · d2bf71a · d2bf71a
1 parent 238ca94
commit d2bf71a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/geonode/security/utils.py b/geonode/security/utils.py
@@ -257,7 +257,7 @@ def purge_geofence_all():
                                 raise e
                 except Exception:
                     logger.debug("Response [{}] : {}".format(r.status_code, r.text))
-        except Exception:
+        except BaseException:
             tb = traceback.format_exc()
             logger.debug(tb)
 
@@ -321,7 +321,7 @@ def set_geofence_invalidate_cache():
 
             if (r.status_code < 200 or r.status_code > 201):
                 logger.warning("Could not Invalidate GeoFence Rules.")
-        except Exception:
+        except BaseException:
             tb = traceback.format_exc()
             logger.debug(tb)
 
@@ -348,7 +348,7 @@ def set_geowebcache_invalidate_cache(layer_alternate):
                           auth=HTTPBasicAuth(user, passwd))
         if (r.status_code < 200 or r.status_code > 201):
             logger.warning("Could not Truncate GWC Cache for Layer '%s'." % layer_alternate)
-    except Exception:
+    except BaseException:
         tb = traceback.format_exc()
         logger.debug(tb)
 
@@ -404,7 +404,7 @@ def set_geofence_all(instance):
                 "Response {!r} : {}".format(response.status_code, response.text))
             raise RuntimeError("Could not ADD GeoServer ANONYMOUS Rule "
                                "for Layer {}".format(resource.layer.name))
-    except Exception:
+    except BaseException:
         tb = traceback.format_exc()
         logger.debug(tb)
     finally:
@@ -484,7 +484,7 @@ def remove_object_permissions(instance):
                 purge_geofence_layer_rules(resource)
         except (ObjectDoesNotExist, RuntimeError):
             pass  # This layer is not manageable by geofence
-        except Exception:
+        except BaseException:
             tb = traceback.format_exc()
             logger.debug(tb)
         finally:

diff --git a/geonode/utils.py b/geonode/utils.py
@@ -988,6 +988,8 @@ def fixup_shp_columnnames(inShapefile, charset, tempdir=None):
     try:
         inDataSource = inDriver.Open(inShapefile, 1)
     except BaseException:
+        tb = traceback.format_exc()
+        logger.debug(tb)
         inDataSource = None
     if inDataSource is None:
         logger.warning('Could not open %s' % (inShapefile))