rda-python-metrics 2.0.0__tar.gz → 2.0.1__tar.gz

{rda_python_metrics-2.0.0/src/rda_python_metrics.egg-info → rda_python_metrics-2.0.1}/PKG-INFO

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

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

{rda_python_metrics-2.0.0 → rda_python_metrics-2.0.1}/src/rda_python_metrics/PgIPInfo.py

@@ -272,13 +272,13 @@ def get_missing_ipinfo(ip, email = None):
    if not ip:
       if email and '@' in email: ip = dns_to_ip(email.split('@')[1])
       if not ip: return None
-
+      ip = ip[0]
    ipinfo = set_ipinfo(ip)
    if ipinfo:
       record = {'org_type' : ipinfo['org_type'],
                 'country' : ipinfo['country'],
                 'region' : ipinfo['region'],
-                'hostname' : ipinfo['hostname'],
+#                'hostname' : ipinfo['hostname'],
                 'ip' : ipinfo['ip']}
       if not email or re.search(r'-$', email):
          record['email'] =  'unknown@' + ipinfo['hostname']

{rda_python_metrics-2.0.0 → rda_python_metrics-2.0.1}/src/rda_python_metrics/fillosdfusage.py

@@ -111,7 +111,7 @@ class FillOSDFUsage(PgIPInfo, PgFile, PgSplit):
             if entcnt%20000 == 0:
                dcnt = len(records)
                self.pglog("{}: {}/{} OSDF log entries processed/records added".format(logfile, entcnt, dcnt), self.WARNLG)
-            ms = re.match(r'^\[(\S+)\] \[Objectname:\/ncar\/rda\/([a-z]\d{6})\/\S+\].* \[Site:(\S+)\].* \[Host:(\S+)\].* \[AppInfo:(\S+)\].* \[Read:(\d+)\]', line)
+            ms = re.match(r'^\[(\S+)\] \[Objectname:\/ncar\/rda\/([a-z]\d{6})\/\S+\].* \[Site:(\S+)\].* \[Host:(\S+)\].* \[AppInfo:(\S*)\].* \[Read:(\d+)\]', line)
             if not ms: continue
             dt = ms.group(1)
             dsid = ms.group(2)

{rda_python_metrics-2.0.0 → rda_python_metrics-2.0.1}/src/rda_python_metrics/pg_ipinfo.py

@@ -34,6 +34,7 @@ class PgIPInfo(PgUtil):
       self.IPDB = None
       self.G2DB = None
       self.IPRECS = {}
+      self.DMRECS = {}
       self.COUNTRIES = {}
 
    # get save a global dns.resolver.Resolver object
@@ -43,17 +44,20 @@ class PgIPInfo(PgUtil):
 
    # Resolve a domain name to an IP address (A record)
    def dns_to_ip(self, dmname, type = 'A'):
+      if dmname in self.DMRECS: return self.DMRECS[dmname]
       ipdns = self.get_dns_resolver()
+      dm = None
       try:
          answers = ipdns.resolve(dmname, type)
-         return [str(rdata) for rdata in answers]
+         dm = [str(rdata) for rdata in answers]
       except dns.resolver.NXDOMAIN:
-         self.pglog(f"{dmname}: the domain name does not exist", self.LOGERR)
+         self.pglog(f"{dmname}: the domain name does not exist", self.LOGWRN)
       except dns.resolver.Timeout:
-         self.pglog(f"{dmname}: the domain name request timed out", self.LOGERR)
+         self.pglog(f"{dmname}: the domain name request timed out", self.LOGWRN)
       except dns.exception.DNSException as e:
-         self.pglog(f"{dmname}: error domain name request: {e}", self.LOGERR)
-      return None
+         self.pglog(f"{dmname}: error domain name request: {e}", self.LOGWRN)
+      self.DMRECS[dmname] = dm
+      return dm
 
    # Get country token name for given two-character domain id
    def get_country_name_code(self, dm):
@@ -62,7 +66,7 @@ class PgIPInfo(PgUtil):
          self.COUNTRIES[dm] = pgrec['token'] if pgrec else 'Unknown'
       return self.COUNTRIES[dm]
 
-   # get contry code from name
+   # get country code from name
    def get_country_record_code(self, cname, kname = None):
       name = cname[kname] if kname else cname
       name = name.replace(' ', '.').upper() if name else 'UNITED.STATES'
@@ -209,21 +213,23 @@ class PgIPInfo(PgUtil):
       return record
 
    # fill the missing info for given ip
-   def get_missing_ipinfo(self, ip, email = None):
+   def get_missing_ipinfo(self, ip, email = None, gethost = False):
       if not ip:
          if email and '@' in email: ip = self.dns_to_ip(email.split('@')[1])
          if not ip: return None
+         ip = ip[0]
       ipinfo = self.set_ipinfo(ip)
       if ipinfo:
          record = {'org_type' : ipinfo['org_type'],
                    'country' : ipinfo['country'],
                    'region' : ipinfo['region'],
-                   'hostname' : ipinfo['hostname'],
                    'ip' : ipinfo['ip']}
          if not email or re.search(r'-$', email):
             record['email'] =  'unknown@' + ipinfo['hostname']
          else:
             record['email'] = email
+         if gethost: record['hostname'] = ipinfo['hostname']
+
          return record
       else:
          return None

{rda_python_metrics-2.0.0 → rda_python_metrics-2.0.1/src/rda_python_metrics.egg-info}/PKG-INFO

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