rda-python-metrics 1.0.23__py3-none-any.whl → 1.0.25__py3-none-any.whl

rda_python_metrics/PgIPInfo.py

@@ -104,6 +104,29 @@ def domain_ipinfo_record(dmname):
 
    return None
 
+#
+# try to get hostname via socket for given ip address
+#
+def get_ip_hostname(ip, iprec, record):
+
+   if iprec:
+      if 'hostname' in iprec and iprec['hostname']:
+         record['hostname'] = iprec['hostname']         
+         record['org_type'] = PgDBI.get_org_type(None, record['hostname'])
+         return
+   record['hostname'] = ip
+   if 'domain' in iprec and iprec['domain']:
+      record['hostname'] += '.' + iprec['domain']
+      record['org_type'] = PgDBI.get_org_type(None, record['hostname'])
+      return
+
+   try:
+      hostrec = socket.gethostbyaddr(ip)
+      record['hostname'] = hostrec[1][0] if hostrec[1] else hostrec[0]
+      record['org_type'] = PgDBI.get_org_type(None, record['hostname'])
+   except Exception as e:
+      PgLOG.pglog("socket: {} - {}".format(ip, str(e)), PgLOG.LOGWRN)
+
 #
 # get a ipinfo record for given ip address
 #
@@ -117,9 +140,7 @@ def get_ipinfo_record(ip):
       return None
       
    record = {'ip' : ip, 'stat_flag' : 'A', 'hostname' : ip, 'org_type' : '-'}
-   if 'hostname' in iprec:
-      record['hostname'] = iprec['hostname']
-      record['org_type'] = PgDBI.get_org_type(None, record['hostname'])
+   get_ip_hostname(ip, iprec, record)
    record['lat'] = float(iprec['latitude']) if iprec['latitude'] else 0
    record['lon'] = float(iprec['longitude']) if iprec['longitude'] else 0
    if 'org' in iprec: record['org_name'] = iprec['org']
@@ -153,6 +174,7 @@ def get_geoip2_record(ip):
       return None
 
    record = {'ip' : ip, 'stat_flag' : 'M', 'org_type' : '-'}
+   get_ip_hostname(ip, None, record)
    record['lat'] = float(city.location.latitude) if city.location.latitude else 0
    record['lon'] = float(city.location.longitude) if city.location.longitude else 0
    record['country'] = get_country_name_code(city.country.name)
@@ -160,17 +182,8 @@ def get_geoip2_record(ip):
    record['region'] = PgLOG.convert_chars(city.subdivisions.most_specific.name) if city.subdivisions.most_specific.name else None
    record['postal'] =  city.postal.code
    record['timezone'] = city.location.time_zone
-   record['hostname'] = ip
    record['ipinfo'] = json.dumps(object_to_dict(city))
 
-   try:
-      hostrec = socket.gethostbyaddr(ip)
-   except Exception as e:
-      PgLOG.pglog("socket: {} - {}".format(ip, str(e)), PgLOG.LOGWRN)
-      return record
-   record['hostname'] = hostrec[1][0] if hostrec[1] else hostrec[0]
-   record['org_type'] = PgDBI.get_org_type(None, record['hostname'])
-
    return record
 
 #
@@ -223,7 +236,7 @@ def set_ipinfo(ip, ipopt = True):
 
    if ip in IPRECS:
       pgrec = IPRECS[ip]
-      if not pgrec or not ipopt or pgrec['stat_flag'] == 'A': return pgrec
+      if pgrec or not ipopt: return pgrec
    else:
       pgrec = PgDBI.pgget('ipinfo', '*', "ip = '{}'".format(ip))
 

rda_python_metrics/fillipinfo.py

@@ -101,9 +101,10 @@ def fill_ip_info(option, inputs, table):
       else:
          date = input + "-01-01"
          edate = input + "-12-31"
-      while date <= edate:
+      while True:
          (ndate, cond) = get_next_date(date, edate)
          cntall += func(date, cond)
+         if ndate >= edate: break
          date = PgUtil.adddate(ndate, 0, 0, 1)
 
    if cntall > 2:
@@ -113,13 +114,13 @@ def get_next_date(date, edate):
 
    if date < edate:
       ndate = PgUtil.enddate(date, 'M')
-      if ndate > edate: ndate = edate
-   if date < ndate:
-      cond = f"BETWEEN '{date}' AND '{ndate}'"
+      if ndate < edate: edate = ndate
+   if date < edate:
+      cond = f"BETWEEN '{date}' AND '{edate}'"
    else:
       cond = f"= '{date}'"
 
-   return (ndate, cond)
+   return (edate, cond)
 
 
 def fix_allusage_records(date, cnd):
@@ -204,7 +205,7 @@ def fix_wuser_records(date, cnd):
 def fix_ipinfo_records(date, cnd):
 
    table = 'ipinfo'
-   cond = f"adddate {cnd} AND region IS NULL"
+   cond = f"adddate {cnd} AND stat_flag = 'M'"
    pgrecs = PgDBI.pgmget(table, 'ip', cond, PgLOG.LGEREX)
    if not pgrecs: return 0
    cnt = len(pgrecs['ip']) if pgrecs else 0

{rda_python_metrics-1.0.23.dist-info → rda_python_metrics-1.0.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.23
+Version: 1.0.25
 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.23.dist-info → rda_python_metrics-1.0.25.dist-info}/RECORD

@@ -1,4 +1,4 @@
-rda_python_metrics/PgIPInfo.py,sha256=SP8vTyCV6owV942xwLvS4CqnyPdkMTEVuQzyB-dkeNk,8644
+rda_python_metrics/PgIPInfo.py,sha256=KMU3_SuuGJgJby3xmmGZ2VGudCgsmI9j4ttZYaTMJeQ,9021
 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=w3IEyxFo8oVGWw8ILAr_GHZ4d8BOf1wWcChIp6OQAtk,6745
+rda_python_metrics/fillipinfo.py,sha256=AKxdFb3Kfra54Vb9zBt6HwqOGpX4dhF5CIH4q_yFPE0,6771
 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
@@ -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.23.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_metrics-1.0.23.dist-info/METADATA,sha256=FIeMLBkhmlMKHNmm7Uq74ipwiT6L-u4lTL5lVGl8AjI,761
-rda_python_metrics-1.0.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_metrics-1.0.23.dist-info/entry_points.txt,sha256=YfFLzlE3rdufSV471VsDnfYptnt1lR08aSrxPXlKqlY,1185
-rda_python_metrics-1.0.23.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
-rda_python_metrics-1.0.23.dist-info/RECORD,,
+rda_python_metrics-1.0.25.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_metrics-1.0.25.dist-info/METADATA,sha256=A0OujABjyHGsOSxkjJ6ekGmXyl-DhOGc9zKKDuJxL_w,761
+rda_python_metrics-1.0.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rda_python_metrics-1.0.25.dist-info/entry_points.txt,sha256=YfFLzlE3rdufSV471VsDnfYptnt1lR08aSrxPXlKqlY,1185
+rda_python_metrics-1.0.25.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
+rda_python_metrics-1.0.25.dist-info/RECORD,,