From: Alexander Vasarab <alexander@wylark.com>
Date: Tue, 16 Feb 2021 05:42:18 +0000 (-0800)
Subject: Merge branch 'release-3.2.2'
X-Git-Tag: v3.2.2^0
X-Git-Url: https://wylark.com/src/infoex-autowx.git/commitdiff_plain/3a9a84ce23b160b482adfd2444edb19342ee8829?hp=d2b7a2212a43561f6530ea5068a7e1b405739b4d

Merge branch 'release-3.2.2'
---

diff --git a/README.md b/README.md
index fe6d0ab..6a9c1f5 100644
--- a/README.md
+++ b/README.md
@@ -295,6 +295,14 @@ windGustSpeedNum
 Version history
 ---------------
 
+- 3.2.2 (Feb 2021)
+
+  Various small fixes.
+
+  - Round precipitation accumulation values to 2 decimal places.
+  - Catch requests' ConnectionException.
+  - Improve logging output when using stdout.
+
 - 3.2.1 (Feb 2021)
 
   Fix config validation bug with units and custom Python program.
diff --git a/infoex-autowx.py b/infoex-autowx.py
index b663163..2bac782 100755
--- a/infoex-autowx.py
+++ b/infoex-autowx.py
@@ -43,7 +43,7 @@ import zeep
 import zeep.cache
 import zeep.transports
 
-__version__ = '3.2.1'
+__version__ = '3.2.2'
 
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.NOTSET)
@@ -155,6 +155,10 @@ def setup_logging(log_level):
         #LOG.addHandler(logging.handlers.SysLogHandler())
         # fallback to stdout
         handler = logging.StreamHandler(sys.stdout)
+        formatter = logging.Formatter('%(asctime)s.%(msecs)03d '
+            '%(levelname)s %(module)s - %(funcName)s: %(message)s',
+            '%Y-%m-%d %H:%M:%S')
+        handler.setFormatter(formatter)
         LOG.addHandler(handler)
 
     # ugly, but passable
@@ -290,6 +294,8 @@ def main():
             infoex['wx_data'][element_cd] = round(infoex['wx_data'][element_cd])
         elif element_cd in ['TOBS', 'air_temp', 'PRES', 'pressure']:
             infoex['wx_data'][element_cd] = round(infoex['wx_data'][element_cd], 1)
+        elif element_cd in ['PREC', 'precip_accum']:
+            infoex['wx_data'][element_cd] = round(infoex['wx_data'][element_cd], 2)
 
         # CONSIDER: Casting every value to Float() -- need to investigate if
         #           any possible elementCds we may want are any other data
@@ -462,7 +468,12 @@ def get_mesowest_data(begin, end, station):
 
     # construct final, completed API URL
     api_req_url = station['source'] + '&start=' + begin_date_str + '&end=' + end_date_str
-    req = requests.get(api_req_url)
+
+    try:
+        req = requests.get(api_req_url)
+    except requests.exceptions.ConnectionError:
+        LOG.error("Could not connect to '%s'", api_req_url)
+        sys.exit(1)
 
     try:
         json = req.json()