rda-python-metrics 1.0.20__tar.gz → 1.0.22__tar.gz

{rda_python_metrics-1.0.20/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.20
+Version: 1.0.22
 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.20 → rda_python_metrics-1.0.22}/pyproject.toml

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

{rda_python_metrics-1.0.20 → rda_python_metrics-1.0.22}/src/rda_python_metrics/PgIPInfo.py

@@ -192,8 +192,8 @@ def object_to_dict(obj):
 #
 def update_wuser_email(nhost, ohost):
 
-   pgrec = PgDBI.pgget('wuser', 'widx', "email = 'unknown@{}'".format(ohost))
-   if pgrec: PgDBI.pgexec("UPDATE wuser SET email = 'unknown@{}' WHERE widx = {}".format(nhost, pgrec['widx']))
+   pgrec = PgDBI.pgget('wuser', 'wuid', "email = 'unknown@{}'".format(ohost))
+   if pgrec: PgDBI.pgexec("UPDATE wuser SET email = 'unknown@{}' WHERE wuid = {}".format(nhost, pgrec['wuid']))
 
 #
 # update a ipinfo record; add a new one if not exists yet

{rda_python_metrics-1.0.20 → rda_python_metrics-1.0.22}/src/rda_python_metrics/fillipinfo.py

@@ -112,7 +112,10 @@ def fill_ip_info(option, inputs, table):
          func = eval('fix_{}_records'.format(table))
          cntall += func(date)
          date = PgUtil.adddate(date, 0, 0, 1)
-   return cntall
+   
+   if cntall > 2:
+      PgLOG.pglog("{}: Total {} records updated".format(table, cntall), PgLOG.LOGWRN)
+
 
 def fix_allusage_records(date):
 
@@ -196,17 +199,16 @@ def fix_wuser_records(date):
 def fix_ipinfo_records(date):
 
    table = 'ipinfo'
-   cond = "date = '{}' AND region IS NULL".format(date)
+   cond = "adddate = '{}' AND region IS NULL".format(date)
    pgrecs = PgDBI.pgmget(table, 'ip', cond, PgLOG.LGEREX)
    if not pgrecs: return 0
    cnt = len(pgrecs['ip']) if pgrecs else 0
    mcnt = 0
    for i in range(cnt):
-      PgIPInfo.set_ipinfo(pgrecs['ip'][i])
+      if PgIPInfo.set_ipinfo(pgrecs['ip'][i]): mcnt +=1
 
-   mcnt = PgIPInfo.IPINFO['IPUPDT']
    s = 's' if cnt > 1 else ''
-   PgLOG.pglog("{}: {} of {} record{} updated".format(table, mcnt, cnt, s), PgLOG.LOGWRN)
+   PgLOG.pglog("{}: {} of {} record{} updated for {}".format(table, mcnt, cnt, s, date), PgLOG.LOGWRN)
 
    return mcnt
 

{rda_python_metrics-1.0.20 → rda_python_metrics-1.0.22/src/rda_python_metrics.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.20
+Version: 1.0.22
 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