rda-python-metrics 1.0.27__py3-none-any.whl → 1.0.30__py3-none-any.whl

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/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/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/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.dist-info → rda_python_metrics-1.0.30.dist-info}/METADATA

@@ -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.dist-info → rda_python_metrics-1.0.30.dist-info}/RECORD

@@ -1,4 +1,4 @@
-rda_python_metrics/PgIPInfo.py,sha256=qsFLxYXiHIvRA7c4k5YUpMR3nu8wcnLL2Jf5G01Sibg,9090
+rda_python_metrics/PgIPInfo.py,sha256=uP_rfGYKNjbxpcQ5Biqmh9nBe5kADFRNm69qJtotME4,9212
 rda_python_metrics/PgView.py,sha256=r6otb3DjfiaQJdg0z8bZQAOlhr4JnrXJzp9wgWh_8qQ,24369
 rda_python_metrics/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 rda_python_metrics/fillawsusage.py,sha256=SZH9G4jruKvavqSr9DiVmHVW929E60tJGUkv8CK3GQI,8152
@@ -15,7 +15,7 @@ rda_python_metrics/fillipinfo.py,sha256=BrboxAIs8Q5jhz_4GYW_GibMT5GyEbnQkYfFR8hc
 rda_python_metrics/fillipinfo.usg,sha256=YeCR58xGv0emqHUZ_9R977HrqaeBwbd6j5QRF2Lc7TA,702
 rda_python_metrics/filloneorder.py,sha256=ADHbcKCDh9bJunnxYbkbjwU2QpC43hvGlLWaURHNxkg,5433
 rda_python_metrics/filloneorder.usg,sha256=mtOySKx6-D4k2bbTcmi6cSYtINiycRyHQkHozi0CQu0,1466
-rda_python_metrics/fillosdfusage.py,sha256=-VJWSKUwbRxfgjoE0PKmE5kUfmuXOcDlEfFd9gLX_ac,7892
+rda_python_metrics/fillosdfusage.py,sha256=PLMo0cfuqnu2z7l7OCpn2gUifQf1gT33rXLSRXDsqcU,7916
 rda_python_metrics/fillosdfusage.usg,sha256=Jlyn6K1LS1ZqDbmOQpR3KNVnp43-kfyvqYlcDt4jPOM,632
 rda_python_metrics/fillrdadb.py,sha256=cb6upPApAZloOouUSzZZmjGvOsYT_Nzh9Lz926WE3ZQ,5333
 rda_python_metrics/fillrdadb.usg,sha256=E_Bf4G8yVABogjRmIOaIbTGgnII2W6RltaFad2XEV2Q,1228
@@ -25,9 +25,9 @@ rda_python_metrics/filluser.py,sha256=CvaMRaUPaR9nxJAExkLTb3Ci4sD7RQMOpWhWJdbyMF
 rda_python_metrics/filluser.usg,sha256=Xgqi0QwA9-4jpYj3L4Q4TISpVwRlsomt2G7T0oYAFak,520
 rda_python_metrics/logarch.py,sha256=cMty6vI5t4oBAKnA4VYZjEvfYoj_8cSUuW0orPOJOZQ,13721
 rda_python_metrics/logarch.usg,sha256=6ksFxu_-lzhRpQE2YFAqgGVhwFP4PTweCbFBuGhhICU,960
-rda_python_metrics/pgperson.py,sha256=q_0jSlTyqEQh2J8yq5Nrf9TLg1awvREdp3E8XyN7PoI,2068
+rda_python_metrics/pgperson.py,sha256=4XTDnVBFyF9drzx2I_DGCxQ-8I1bpclqTuQvOx3wST4,2088
 rda_python_metrics/pgsyspath.py,sha256=DZhFp-r-LzN0qrHtfdCYfnGDnmD_R4ufuEduk0_vRIw,1039
-rda_python_metrics/pgusername.py,sha256=sNtPNKdubZYNPWR89pAXHGTuP6q8kuf71ig7-XJLXrQ,1245
+rda_python_metrics/pgusername.py,sha256=VoNJfXBsyzdfz49qwCypnUsqcDm4cUaqOYViJ-jzaKI,1265
 rda_python_metrics/viewallusage.py,sha256=DlAvY2bieJWrrrYMPhCkKWgqdfSN492_LZCS95BhY0A,15753
 rda_python_metrics/viewallusage.usg,sha256=Vfwc6aNIkpe1FBdBsV2htyUESgmx6ODhMMwAb1NX8-0,10297
 rda_python_metrics/viewcheckusage.py,sha256=HougqjDAOVG6pYglFjyHQ-UdLBcYe7v_jzU1-80RqFA,12996
@@ -44,9 +44,9 @@ rda_python_metrics/viewwebfile.py,sha256=HSMNkQQawonu6W3blV7g9UbJuNy9VAOn9COqgmj
 rda_python_metrics/viewwebfile.usg,sha256=lTNi8Yu8BUJuExEDJX-vsJyWUSUIQTS-DiiBEVFo33s,10054
 rda_python_metrics/viewwebusage.py,sha256=ES2lI8NaCeCpTGi94HU-cDRBxHMiUBbplyYsZf2KqF0,16650
 rda_python_metrics/viewwebusage.usg,sha256=OVDZ78p87E3HLW34ZhasNJ7Zmw8XXjmZPPWZfRhPLXo,9936
-rda_python_metrics-1.0.27.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_metrics-1.0.27.dist-info/METADATA,sha256=h9bDjGMnSa_wrkyW_yAVpRDVIec5beoY8p1a_yC0uX8,761
-rda_python_metrics-1.0.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_metrics-1.0.27.dist-info/entry_points.txt,sha256=YfFLzlE3rdufSV471VsDnfYptnt1lR08aSrxPXlKqlY,1185
-rda_python_metrics-1.0.27.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
-rda_python_metrics-1.0.27.dist-info/RECORD,,
+rda_python_metrics-1.0.30.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_metrics-1.0.30.dist-info/METADATA,sha256=vuF7AcTnuZSCLCOCprWvOJ0TY6lQCjW5f8N6y38UCiU,761
+rda_python_metrics-1.0.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rda_python_metrics-1.0.30.dist-info/entry_points.txt,sha256=YfFLzlE3rdufSV471VsDnfYptnt1lR08aSrxPXlKqlY,1185
+rda_python_metrics-1.0.30.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
+rda_python_metrics-1.0.30.dist-info/RECORD,,