rda-python-metrics 1.0.36__tar.gz → 1.0.38__tar.gz

{rda_python_metrics-1.0.36/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.38}/PKG-INFO

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

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

{rda_python_metrics-1.0.36 → rda_python_metrics-1.0.38}/src/rda_python_metrics/logarch.py

@@ -330,12 +330,12 @@ def add_sublog_files(fext, sext, minsize = 0):
       sfile = "{}/{}".format(subname, afile)
       if minsize and PgFile.local_file_size(sfile, 1) < 1: continue
       PgLOG.pgsystem("echo '{}: {}' >> {}".format(bid, sfiles[afile], logfile), PgLOG.LGWNEX, 5+1024)
-      PgLOG.pgsystem("cat {} >> {}".format(sfile, logfile), PgLOG.LGWNEX, 5+1024)
-      PgFile.delete_local_file(sfile, PgLOG.LOGWRN)
-      acnt += 1
+      if PgLOG.pgsystem("cat {} >> {}".format(sfile, logfile), PgLOG.EMEROL, 5+1024):
+         PgFile.delete_local_file(sfile, PgLOG.LOGWRN)
+         acnt += 1
    if fcnt > 0:
       s = 's' if fcnt > 1 else ''
-      PgLOG.pglog("{}: {} of {} '{}' file{} appended at {}".format(logfile, acnt, fcnt, fext, s, PgLOG.current_datetime()), PgLOG.LOGWRN)
+      PgLOG.pglog("{}: {} of {} '{}' file{} appended at {}".format(logfile, acnt, fcnt, fext, s, PgLOG.current_datetime()), PgLOG.LGWNEM)
 
    if minsize: PgLOG.PGLOG['MINSIZE'] = tmin
 

{rda_python_metrics-1.0.36 → rda_python_metrics-1.0.38}/src/rda_python_metrics/viewosdfusage.usg

@@ -2,19 +2,19 @@
  View usage information of OSDF Data Services from information
  stored in PostgreSQL database 'RDADB'.
 
- Usage: viewawsusage [-C] ColumnNames [-O OrderColumnNames] [-a] \
-                     [-A RowLimit] [-c CountryCodes] [-d DateList] \
-                     [-D StartDate [EndDate]] [-e EMailList] -h \
-                     [-E StartNoticeDate [EndNoticeDate]] \
-                     [-i IPAddresses] [-I EmailIDList] \
-                     [-k RegionNames] [-m MonthList] [-M AccessMethods]  \
-                     [-N MinNumberRead [MaxNumberRead]] \
-                     [-o OrganizationTypes] \
-                     [-q QuaterList] [-s MinSize [MaxSize]] \
-                     [-S SpecialistLoginNames] [-t DatasetList] \
-                     [-T MinDataset [MaxDataset]] [-y YearList] \
-                     [-H Title] [-L Delimiter] [-U SizeUnit] \
-                     [-w] [-z] [> OutputFileName] [| lp -d PrinterName] 
+ Usage: viewosdfusage [-C] ColumnNames [-O OrderColumnNames] [-a] \
+                      [-A RowLimit] [-c CountryCodes] [-d DateList] \
+                      [-D StartDate [EndDate]] [-e EMailList] -h \
+                      [-E StartNoticeDate [EndNoticeDate]] \
+                      [-i IPAddresses] [-I EmailIDList] \
+                      [-k RegionNames] [-m MonthList] [-M AccessMethods]  \
+                      [-N MinNumberRead [MaxNumberRead]] \
+                      [-o OrganizationTypes] \
+                      [-q QuaterList] [-s MinSize [MaxSize]] \
+                      [-S SpecialistLoginNames] [-t DatasetList] \
+                      [-T MinDataset [MaxDataset]] [-y YearList] \
+                      [-H Title] [-L Delimiter] [-U SizeUnit] \
+                      [-w] [-z] [> OutputFileName] [| lp -d PrinterName] 
 
       Specify [-C] ColumnNames, refer to Option -C section for detail
       description, and choose at least one of the condition options, -a, -c,
@@ -98,7 +98,7 @@
 
 
       Condition Options:
-      - Option -a, for all usage in table 'awsusage';
+      - Option -a, for all usage in table 'osdfusage';
 
       - Option -A, gives a row limit for querrying; 
 
@@ -175,16 +175,16 @@
       EMAIL(E), ORGTYPE(O), #READ(H), and MBREAD(B); ordered by ORGTYPE as
       ascending and MBREAD(B) as descending; the command line should be:
 
-         viewawsusage XEOHB -y 2005 -O Ob
+         viewosdfusage XEOHB -y 2005 -O Ob
 
       For usage by users not in Organization 'DDS', out of the file usage
       gathered above, the command line should be:
 
-         viewawsusage XEOHB -y 2005 -o ! DSS -O Ob
+         viewosdfusage XEOHB -y 2005 -o ! DSS -O Ob
 
-      To redirect the previous output to a file named awsusage.out:
+      To redirect the previous output to a file named osdfusage.out:
 
-         viewawsusage XEOHB -y 2005 ! DSS -O Ob > awsusage.out
+         viewosdfusage XEOHB -y 2005 ! DSS -O Ob > osdfusage.out
 
       Then you can view the file or print it as a report.
 

{rda_python_metrics-1.0.36 → rda_python_metrics-1.0.38/src/rda_python_metrics.egg-info}/PKG-INFO

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