rda-python-metrics 1.0.27__py3-none-any.whl → 1.0.28__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of rda-python-metrics might be problematic. Click here for more details.

Files changed (8) hide show
  1. rda_python_metrics/PgIPInfo.py +1 -1
  2. rda_python_metrics/fillosdfusage.py +1 -1
  3. {rda_python_metrics-1.0.27.dist-info → rda_python_metrics-1.0.28.dist-info}/METADATA +1 -1
  4. {rda_python_metrics-1.0.27.dist-info → rda_python_metrics-1.0.28.dist-info}/RECORD +8 -8
  5. {rda_python_metrics-1.0.27.dist-info → rda_python_metrics-1.0.28.dist-info}/WHEEL +0 -0
  6. {rda_python_metrics-1.0.27.dist-info → rda_python_metrics-1.0.28.dist-info}/entry_points.txt +0 -0
  7. {rda_python_metrics-1.0.27.dist-info → rda_python_metrics-1.0.28.dist-info}/licenses/LICENSE +0 -0
  8. {rda_python_metrics-1.0.27.dist-info → rda_python_metrics-1.0.28.dist-info}/top_level.txt +0 -0
rda_python_metrics/PgIPInfo.py CHANGED
@@ -303,7 +303,7 @@ def get_wuser_record(ip, date, email = None):
303
303
  wuid = PgDBI.pgadd("wuser", record, PgLOG.LOGERR|PgLOG.AUTOID)
304
304
  if wuid:
305
305
  record['wuid'] = wuid
306
- PgLOG.pglog("{} Added as wuid({})".format(email, wuid), PgLOG.LGWNEM)
306
+ PgLOG.pglog("{} Added as wuid({})".format(record['email'], wuid), PgLOG.LGWNEM)
307
307
  return record
308
308
 
309
309
  return None
rda_python_metrics/fillosdfusage.py CHANGED
@@ -129,7 +129,7 @@ def fill_osdf_usages(fnames):
129
129
  PgLOG.pglog("{}: {}/{} OSDF log entries processed/records added".format(logfile, entcnt, cntadd), PgLOG.WARNLG)
130
130
 
131
131
  ms = re.match(r'^\[(\S+)\] \[Objectname:\/ncar\/rda\/([a-z]\d{6})\/(\S+)\].* \[Host:(\S+)\].* \[AppInfo:(\S+)\].* \[Read:(\d+)\]', line)
132
- if not ms: continue
132
+ if not ms or ms.group(4) == 'N/A': continue
133
133
  dt = ms.group(1)
134
134
  dsid = ms.group(2)
135
135
  wfile = ms.group(3)
{rda_python_metrics-1.0.27.dist-info → rda_python_metrics-1.0.28.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_metrics
3
- Version: 1.0.27
3
+ Version: 1.0.28
4
4
  Summary: RDA Python Package to gather and view data usage metrics
5
5
  Author-email: Zaihua Ji <zji@ucar.edu>
6
6
  Project-URL: Homepage, https://github.com/NCAR/rda-python-metrics
{rda_python_metrics-1.0.27.dist-info → rda_python_metrics-1.0.28.dist-info}/RECORD RENAMED
@@ -1,4 +1,4 @@
1
- rda_python_metrics/PgIPInfo.py,sha256=qsFLxYXiHIvRA7c4k5YUpMR3nu8wcnLL2Jf5G01Sibg,9090
1
+ rda_python_metrics/PgIPInfo.py,sha256=-LjrdFYY_WJBzGqK7A3j1YPsYgBAcLMI_lRYH2o6ScE,9100
2
2
  rda_python_metrics/PgView.py,sha256=r6otb3DjfiaQJdg0z8bZQAOlhr4JnrXJzp9wgWh_8qQ,24369
3
3
  rda_python_metrics/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
4
4
  rda_python_metrics/fillawsusage.py,sha256=SZH9G4jruKvavqSr9DiVmHVW929E60tJGUkv8CK3GQI,8152
@@ -15,7 +15,7 @@ rda_python_metrics/fillipinfo.py,sha256=BrboxAIs8Q5jhz_4GYW_GibMT5GyEbnQkYfFR8hc
15
15
  rda_python_metrics/fillipinfo.usg,sha256=YeCR58xGv0emqHUZ_9R977HrqaeBwbd6j5QRF2Lc7TA,702
16
16
  rda_python_metrics/filloneorder.py,sha256=ADHbcKCDh9bJunnxYbkbjwU2QpC43hvGlLWaURHNxkg,5433
17
17
  rda_python_metrics/filloneorder.usg,sha256=mtOySKx6-D4k2bbTcmi6cSYtINiycRyHQkHozi0CQu0,1466
18
- rda_python_metrics/fillosdfusage.py,sha256=-VJWSKUwbRxfgjoE0PKmE5kUfmuXOcDlEfFd9gLX_ac,7892
18
+ rda_python_metrics/fillosdfusage.py,sha256=PLMo0cfuqnu2z7l7OCpn2gUifQf1gT33rXLSRXDsqcU,7916
19
19
  rda_python_metrics/fillosdfusage.usg,sha256=Jlyn6K1LS1ZqDbmOQpR3KNVnp43-kfyvqYlcDt4jPOM,632
20
20
  rda_python_metrics/fillrdadb.py,sha256=cb6upPApAZloOouUSzZZmjGvOsYT_Nzh9Lz926WE3ZQ,5333
21
21
  rda_python_metrics/fillrdadb.usg,sha256=E_Bf4G8yVABogjRmIOaIbTGgnII2W6RltaFad2XEV2Q,1228
@@ -44,9 +44,9 @@ rda_python_metrics/viewwebfile.py,sha256=HSMNkQQawonu6W3blV7g9UbJuNy9VAOn9COqgmj
44
44
  rda_python_metrics/viewwebfile.usg,sha256=lTNi8Yu8BUJuExEDJX-vsJyWUSUIQTS-DiiBEVFo33s,10054
45
45
  rda_python_metrics/viewwebusage.py,sha256=ES2lI8NaCeCpTGi94HU-cDRBxHMiUBbplyYsZf2KqF0,16650
46
46
  rda_python_metrics/viewwebusage.usg,sha256=OVDZ78p87E3HLW34ZhasNJ7Zmw8XXjmZPPWZfRhPLXo,9936
47
- rda_python_metrics-1.0.27.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
48
- rda_python_metrics-1.0.27.dist-info/METADATA,sha256=h9bDjGMnSa_wrkyW_yAVpRDVIec5beoY8p1a_yC0uX8,761
49
- rda_python_metrics-1.0.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
50
- rda_python_metrics-1.0.27.dist-info/entry_points.txt,sha256=YfFLzlE3rdufSV471VsDnfYptnt1lR08aSrxPXlKqlY,1185
51
- rda_python_metrics-1.0.27.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
52
- rda_python_metrics-1.0.27.dist-info/RECORD,,
47
+ rda_python_metrics-1.0.28.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
48
+ rda_python_metrics-1.0.28.dist-info/METADATA,sha256=GzBHBJZe8WsPVsDVazmyWoHWhFI1wOVG_NTdOGOEDF8,761
49
+ rda_python_metrics-1.0.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
50
+ rda_python_metrics-1.0.28.dist-info/entry_points.txt,sha256=YfFLzlE3rdufSV471VsDnfYptnt1lR08aSrxPXlKqlY,1185
51
+ rda_python_metrics-1.0.28.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
52
+ rda_python_metrics-1.0.28.dist-info/RECORD,,