rda-python-metrics 1.0.20__py3-none-any.whl → 1.0.22__py3-none-any.whl

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

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

@@ -1,4 +1,4 @@
-rda_python_metrics/PgIPInfo.py,sha256=HkGja5ctMfV4aJ3spcIsTmDljkU1Q6-RiUzXkwxyi8g,8644
+rda_python_metrics/PgIPInfo.py,sha256=SP8vTyCV6owV942xwLvS4CqnyPdkMTEVuQzyB-dkeNk,8644
 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
@@ -11,7 +11,7 @@ rda_python_metrics/fillcountry.py,sha256=7i5LNi3scRoyRCT6t7aeNTGKOpxzJ2mA9tnvUqj
 rda_python_metrics/fillendtime.py,sha256=skZttlpoY19g0dGwqGQI8t_1YPPTPEXwg3EfNlfL90I,2533
 rda_python_metrics/fillglobususage.py,sha256=ahz8XnnJdD_AbSYqJ34lWmDuzws_-SNmCR8QE20aovA,8539
 rda_python_metrics/fillglobususage.usg,sha256=1GgmCP22IQZdADwL5Mmkz3v8Ws-G7U3teQ1AxRJfV_4,637
-rda_python_metrics/fillipinfo.py,sha256=Ja1BbyiCA7IueM6o9KxfD-BstA4EVSnjzrwj6hkFgoY,6641
+rda_python_metrics/fillipinfo.py,sha256=O2uTGCw13ITZn6tfhNT_9DQJ8-RM5TVZfYIJCYm01oY,6726
 rda_python_metrics/fillipinfo.usg,sha256=6NoOTStxsVXwycN8u8znnwC6AemKftR2ZGrW_RL41og,647
 rda_python_metrics/filloneorder.py,sha256=ADHbcKCDh9bJunnxYbkbjwU2QpC43hvGlLWaURHNxkg,5433
 rda_python_metrics/filloneorder.usg,sha256=mtOySKx6-D4k2bbTcmi6cSYtINiycRyHQkHozi0CQu0,1466
@@ -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.20.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_metrics-1.0.20.dist-info/METADATA,sha256=zbFFqGetH5z8euwjan-oU--BVDuBsbJnMbggMNdSpDw,761
-rda_python_metrics-1.0.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_metrics-1.0.20.dist-info/entry_points.txt,sha256=YfFLzlE3rdufSV471VsDnfYptnt1lR08aSrxPXlKqlY,1185
-rda_python_metrics-1.0.20.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
-rda_python_metrics-1.0.20.dist-info/RECORD,,
+rda_python_metrics-1.0.22.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_metrics-1.0.22.dist-info/METADATA,sha256=1EgQwJ6ezL7DX5PRIPAP6tdEfG_3aIKdDstqjQ7NJN0,761
+rda_python_metrics-1.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rda_python_metrics-1.0.22.dist-info/entry_points.txt,sha256=YfFLzlE3rdufSV471VsDnfYptnt1lR08aSrxPXlKqlY,1185
+rda_python_metrics-1.0.22.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
+rda_python_metrics-1.0.22.dist-info/RECORD,,