X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02.git/blobdiff_plain/a4823900b419f0fd59ee64c791243470f88d5cb8..c9e748782068612236f4bb6c58b1c9b1c99e2590:/exec/bklog?ds=inline

diff --git a/exec/bklog b/exec/bklog
index 45e6996..cc807a6 100644
--- a/exec/bklog
+++ b/exec/bklog
@@ -11,8 +11,9 @@ dirTmpDefault="/dev/shm"; # Default parent of working directory
 
 # Script Metadata
 scriptName="bklog";             # Define basename of script file.
-scriptVersion="0.1.27";          # Define version of script.
-scriptURL="https://gitlab.com/baltakatei/ninfacyzga-01"; # Define wesite hosting this script.
+scriptVersion="0.1.33";         # Define version of script.
+scriptURL="https://gitlab.com/baltakatei/ninfacyzga-01"; # Define website hosting this script.
+scriptTimeStartEpoch="$(date +%s)"; # Save start time of script in epoch seconds
 scriptTimeStart="$(date +%Y%m%dT%H%M%S.%N)"; # YYYYmmddTHHMMSS.NNNNNNNNN
 scriptHostname=$(hostname);     # Save hostname of system running this script.
 PATH="$HOME/.local/bin:$PATH";  # Add "$(systemd-path user-binaries)" path in case user apps saved there
@@ -57,7 +58,7 @@ processArguments() {
 	    -p | --process-string) optionProcString="true" && argProcStrings+=("$2") && argProcFileExts+=("$3") && vbm "STATUS:file extension \"$3\" for output of processing string added:\"$2\""; shift; shift;;
 	    -l | --label) optionLabel="true" && argLabel="$2"; vbm "DEBUG :Custom label received:$argLabel"; shift;;
 	    -w | --store-raw) optionStoreRaw="true" && argRawFileExt="$2"; vbm "DEBUG :Raw stdin file extension received:$argRawFileExt"; shift;;
-	    -W | --no-store-raw) optionNoStoreRaw="true"; vbm "DEBUG :Option selected to not store raw stdin data."; shift;;
+	    -W | --no-store-raw) optionNoStoreRaw="true"; vbm "DEBUG :Option selected to not store raw stdin data.";;
 	    *) yell "ERROR: Unrecognized argument: $1"; yell "STATUS:All arguments:$*"; exit 1;; # Handle unrecognized options.
 	esac
 	shift
@@ -495,7 +496,7 @@ timeDuration(){
     # Ref/Attrib: ISO-8601:2004(E), §4.4.4.2 Representations of time intervals by duration and context information
     # Note: "1 month" ("P1M") is assumed to be "30 days" (see ISO-8601:2004(E), §2.2.1.2)
     # Usage: timeDuration [1:seconds] ([2:precision])
-    # Version: 1.0.4
+    # Version: 1.0.5
     # Input: arg1: seconds as base 10 integer >= 0  (ex: 3601)
     #        arg2: precision level (optional; default=2)
     # Output: stdout: ISO-8601 duration string (ex: "P1H1S", "P2Y10M15DT10H30M20S")
@@ -571,7 +572,7 @@ timeDuration(){
     if [[ $fullDays -gt 0 ]]; then hasDays="true"; else hasDays="false"; fi
     if [[ $fullHours -gt 0 ]]; then hasHours="true"; else hasHours="false"; fi
     if [[ $fullMinutes -gt 0 ]]; then hasMinutes="true"; else hasMinutes="false"; fi
-    if [[ $fullSeconds -gt 0 ]]; then hasSeconds="true"; else hasSeconds="false"; fi
+    if [[ $fullSeconds -ge 0 ]]; then hasSeconds="true"; else hasSeconds="false"; fi
     
     ## Determine which fields to display (see ISO-8601:2004 §4.4.3.2)
     witherPrecision="false"
@@ -1177,6 +1178,21 @@ magicSetScriptTTL() {
     fi;
     vbm "STATUS:$fn:Finished magicSetScriptTTL() function.";
 } # Set scriptTTL in seconds until next (day|hour).
+magicVerboseReadout() {
+    vbm "$bufferTTL"; # Time-to-live (seconds) for each buffer round
+    vbm "$scriptTTL_TE"; # Time element at the end of which script terminates
+    vbm "$dirTmpDefault"; # Default parent of working directory
+    # Script Metadata
+    vbm "$scriptName"; # Basename of script file.
+    vbm "$scriptVersion"; # Version of script.
+    vbm "$scriptURL"; # Website hosting this script.
+    vbm "$scriptTimeStartEpoch"; # Start time of script in epoch seconds
+    vbm "$scriptTimeStart"; # YYYYmmddTHHMMSS.NNNNNNNNN
+    vbm "$scriptHostname" # Hostname of system running this script.
+    vbm "$PATH"; # PATH env. var.
+    vbm "$ageVersion"; # Version of age (encryption program)
+    vbm "$ageURL"; # Website hosting age.
+} # Display script variables
 magicWriteVersion() {
     # Desc: Appends time-stamped VERSION to pathout_tar
     # Usage: magicWriteVersion
@@ -1402,6 +1418,8 @@ main() {
     magicParseProcessStrings; # Sets arrays: procStrings, procFileExts
     ## React to "-l" (output file label) option
     magicParseLabel; # sets label (ex: "_location")
+    ## React to "-v" (verbose) option
+    magicVerboseReadout; # Display various script variables
 
     # Perform secondary setup operations
     ## Set script lifespan (scriptTTL from scriptTTL_TE)
@@ -1431,14 +1449,27 @@ main() {
     while [[ $SECONDS -lt "scriptTTL" ]]; do
 	vbm "STATUS:$fn:Starting buffer round:$bufferRound";
 	bufferTOD="$(( (1+bufferRound)*bufferTTL ))" && vbm "DEBUG :$fn:bufferTOD:$bufferTOD"; # Set buffer round time-of-death
-	# Note start time of data collection
-	timeBufferStartEpoch="$(date +%s)" && vbm "DEBUG :$fn:timeBufferStartEpoch:$timeBufferStartEpoch";
 	# Consume stdin to fill buffer until buffer time-of-death (TOD) arrives
 	while read -r -t "$bufferTTL" line && [[ $SECONDS -lt "$bufferTOD" ]]; do
 	    # Append line to buffer array
 	    buffer+=("$line");
-	done;
-	# Note end time of data collection
+	done < /dev/stdin;
+	# End script if buffer array empty (ex: EOF found in stdin)
+	if [[ ${#buffer[@]} -eq 0 ]]; then
+	    yell "ERROR:$fn:Empty array:buffer:${buffer[@]}"; exit 1;
+	fi;
+	# Mark time for buffer
+	## Initial time
+	if [[ bufferRound -gt 0 ]]; then
+	    ### Usual case
+	    timeBufferStartEpoch="$timeBufferEndEpoch" && vbm "DEBUG :$fn:timeBufferStartEpoch:$timeBufferStartEpoch";
+	elif [[ bufferRound -eq 0 ]]; then
+	    ### Edge case: initial startup
+	    timeBufferStartEpoch="$scriptTimeStartEpoch" && vbm "DEBUG :$fn:timeBufferStartEpoch:$timeBufferStartEpoch";
+	else
+	    yell "ERROR:$fn:Invalid bufferRound value."; exit 1;
+	fi;
+	## End Time
 	timeBufferEndEpoch="$(date +%s)" && vbm "DEBUG :$fn:timeBufferEndEpoch:$timeBufferEndEpoch";
 	# Create dir_tmp if missing
 	if ! [[ -d "$dir_tmp" ]]; then