Merge branch 'release-3.0.0' into develop

[infoex-autowx.git] / infoex-autowx.py

diff --git a/infoex-autowx.py b/infoex-autowx.py
index f285c42ae44de8fee51a9ee05afb055b3e8b58f2..3fe07fcbc0754948f02ff22e45d009e588bb3290 100755 (executable)
--- a/infoex-autowx.py
+++ b/infoex-autowx.py
@@ -39,7 +39,7 @@ import zeep
 import zeep.cache
 import zeep.transports
 
 import zeep.cache
 import zeep.transports
 

-__version__ = '2.2.0'
+__version__ = '3.0.0'

 
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.NOTSET)
 
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.NOTSET)


@@ -228,9 +228,9 @@ def main():
 
                 if infoex['wx_data'] is None:
                     infoex['wx_data'] = []
 
                 if infoex['wx_data'] is None:
                     infoex['wx_data'] = []

-            except Exception:
+            except Exception as exc:

                 LOG.error("Python program for custom Wx data failed in "
                 LOG.error("Python program for custom Wx data failed in "

-                          "execution")
+                          "execution: " + str(exc))

                 sys.exit(1)
 
             LOG.info("Successfully executed external Python program")
                 sys.exit(1)
 
             LOG.info("Successfully executed external Python program")


@@ -241,6 +241,10 @@ def main():
             LOG.error("Specified Python program for custom Wx data "
                       "was not found")
             sys.exit(1)
             LOG.error("Specified Python program for custom Wx data "
                       "was not found")
             sys.exit(1)

+        except Exception as exc:
+            LOG.error("A problem was encountered when attempting to "
+                      "load your custom Wx program: " + str(exc))
+            sys.exit(1)

 
     LOG.info("Time taken to get all data : %.3f sec", time.time() -
              time_all_elements)
 
     LOG.info("Time taken to get all data : %.3f sec", time.time() -
              time_all_elements)