rda-python-metrics 1.0.24__tar.gz → 1.0.26__tar.gz

{rda_python_metrics-1.0.24/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.26}/PKG-INFO

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

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

{rda_python_metrics-1.0.24 → rda_python_metrics-1.0.26}/src/rda_python_metrics/PgIPInfo.py

@@ -109,17 +109,23 @@ def domain_ipinfo_record(dmname):
 #
 def get_ip_hostname(ip, iprec, record):
 
-   if iprec and 'hostname' in iprec:
-      record['hostname'] = iprec['hostname']
-      record['org_type'] = PgDBI.get_org_type(None, record['hostname'])
-   else:
-      record['hostname'] = ip
-      try:
-         hostrec = socket.gethostbyaddr(ip)
-         record['hostname'] = hostrec[1][0] if hostrec[1] else hostrec[0]
+   if iprec:
+      if 'hostname' in iprec and iprec['hostname']:
+         record['hostname'] = iprec['hostname']         
          record['org_type'] = PgDBI.get_org_type(None, record['hostname'])
-      except Exception as e:
-         PgLOG.pglog("socket: {} - {}".format(ip, str(e)), PgLOG.LOGWRN)
+         return
+   record['hostname'] = ip
+   if 'asn' in iprec and 'domain' in iprec['asn'] and iprec['asn']['domain']:
+      record['hostname'] += '.' + iprec['asn']['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
@@ -234,7 +240,7 @@ def set_ipinfo(ip, ipopt = True):
    else:
       pgrec = PgDBI.pgget('ipinfo', '*', "ip = '{}'".format(ip))
 
-   if not pgrec:
+   if not pgrec or ipopt and pgrec['stat_flag'] == 'M':
       record = get_ipinfo_record(ip) if ipopt else None
       if not record: record = get_geoip2_record(ip)
       if record and update_ipinfo_record(record, pgrec): pgrec = record

{rda_python_metrics-1.0.24 → rda_python_metrics-1.0.26}/src/rda_python_metrics/fillipinfo.py

@@ -113,7 +113,7 @@ def fill_ip_info(option, inputs, table):
 def get_next_date(date, edate):
 
    if date < edate:
-      ndate = PgUtil.enddate(date, 'M')
+      ndate = PgUtil.enddate(date, 0, 'M')
       if ndate < edate: edate = ndate
    if date < edate:
       cond = f"BETWEEN '{date}' AND '{edate}'"
@@ -205,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.24 → rda_python_metrics-1.0.26/src/rda_python_metrics.egg-info}/PKG-INFO

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