rda-python-metrics 1.0.27__tar.gz → 1.0.30__tar.gz

{rda_python_metrics-1.0.27/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.27
+Version: 1.0.30
 Summary: RDA Python Package to gather and view data usage metrics
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-metrics

{rda_python_metrics-1.0.27 → rda_python_metrics-1.0.30}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_metrics"
-version = "1.0.27"
+version = "1.0.30"
 authors = [
   { name="Zaihua Ji",  email="zji@ucar.edu" },
 ]

{rda_python_metrics-1.0.27 → rda_python_metrics-1.0.30}/src/rda_python_metrics/PgIPInfo.py

@@ -138,7 +138,10 @@ def get_ipinfo_record(ip):
    except Exception as e:
       PgLOG.pglog("ipinfo: {} - {}".format(ip, str(e)), PgLOG.LOGWRN)
       return None
-      
+
+   if 'bogon' in iprec and iprec['bogon']:
+      PgLOG.pglog(f"ipinfo: {ip} - bogon", PgLOG.LOGWRN)
+      return None
    record = {'ip' : ip, 'stat_flag' : 'A', 'hostname' : ip, 'org_type' : '-'}
    get_ip_hostname(ip, iprec, record)
    record['lat'] = float(iprec['latitude']) if iprec['latitude'] else 0
@@ -303,7 +306,7 @@ def get_wuser_record(ip, date, email = None):
    wuid = PgDBI.pgadd("wuser", record, PgLOG.LOGERR|PgLOG.AUTOID)
    if wuid:
       record['wuid'] = wuid
-      PgLOG.pglog("{} Added as wuid({})".format(email, wuid), PgLOG.LGWNEM)
+      PgLOG.pglog("{} Added as wuid({})".format(record['email'], wuid), PgLOG.LGWNEM)
       return record
 
    return None

{rda_python_metrics-1.0.27 → rda_python_metrics-1.0.30}/src/rda_python_metrics/fillosdfusage.py

@@ -129,7 +129,7 @@ def fill_osdf_usages(fnames):
             PgLOG.pglog("{}: {}/{} OSDF log entries processed/records added".format(logfile, entcnt, cntadd), PgLOG.WARNLG)
 
          ms = re.match(r'^\[(\S+)\] \[Objectname:\/ncar\/rda\/([a-z]\d{6})\/(\S+)\].* \[Host:(\S+)\].* \[AppInfo:(\S+)\].* \[Read:(\d+)\]', line)
-         if not ms: continue
+         if not ms or ms.group(4) == 'N/A': continue
          dt = ms.group(1)
          dsid = ms.group(2)
          wfile = ms.group(3)

{rda_python_metrics-1.0.27 → rda_python_metrics-1.0.30}/src/rda_python_metrics/pgperson.py

@@ -33,8 +33,9 @@ def main():
 
    pgname = "pgperson"
    argv = sys.argv[1:]
+   argc = len(sys.argv)
    optstr = '|'.join(PERSON)
-   if sys.argc != 3:
+   if argc != 3:
       print("Usage: {} -({}) OptopnValue".format(pgname, optstr))
       sys.exit(0)
 

{rda_python_metrics-1.0.27 → rda_python_metrics-1.0.30}/src/rda_python_metrics/pgusername.py

@@ -23,7 +23,8 @@ url="https://people.api.ucar.edu/usernames/"
 def main():
 
    pgname = "pgusername"
-   if sys.argc != 2:
+   argc = len(sys.argv)
+   if argc != 2:
       print("Usage: {} UserName".format(pgname))
       sys.exit(0)
 

{rda_python_metrics-1.0.27 → rda_python_metrics-1.0.30/src/rda_python_metrics.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.27
+Version: 1.0.30
 Summary: RDA Python Package to gather and view data usage metrics
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-metrics