X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02.git/blobdiff_plain/5cc9c873cdfaae849f7cd437190eb4bafb0acd54..99e199b255630ca54defe2abbc245bd9e259759c:/exec/bklog

diff --git a/exec/bklog b/exec/bklog
index 0d24898..188910d 100644
--- a/exec/bklog
+++ b/exec/bklog
@@ -11,7 +11,7 @@ dirTmpDefault="/dev/shm"; # Default parent of working directory
 
 # Script Metadata
 scriptName="bklog";             # Define basename of script file.
-scriptVersion="0.1.23";          # Define version of script.
+scriptVersion="0.1.26";          # Define version of script.
 scriptURL="https://gitlab.com/baltakatei/ninfacyzga-01"; # Define wesite hosting this script.
 scriptTimeStart="$(date +%Y%m%dT%H%M%S.%N)"; # YYYYmmddTHHMMSS.NNNNNNNNN
 scriptHostname=$(hostname);     # Save hostname of system running this script.
@@ -357,17 +357,20 @@ checkMakeTar() {
     if tar --list --file="$pathTar" 1>/dev/null 2>&1; then
 	## T1: return success
 	returnFlag0="tar valid";
+    elif { sleep 2; tar --list --file="$pathTar" 1>/dev/null 2>&1; }; then
+	## F1: Check tar archive again after 2-second sleep
+	returnFlag0="tar valid";
     else
-	## F1: Check if file exists
+	## F2-1: Check if file exists
 	if [[ -f "$pathTar" ]]; then
 	    ### T: Rename file
-	    try mv "$pathTar" "$pathTar""--broken--""$(date +%Y%m%dT%H%M%S)" && \
+	    try mv "$pathTar" "$pathTar""--broken--""$(date +%Y%m%dT%H%M%S%z)" && \
 		returnFlag1="tar moved";
 	else
 	    ### F: -
 	    :
 	fi;
-	## F2: Create tar archive, return 0
+	## F2-1: Create tar archive, return 0
 	try tar --create --file="$pathTar" --files-from=/dev/null && \
 	    returnFlag2="tar created";
     fi;
@@ -1215,14 +1218,15 @@ magicWriteVersion() {
 } # write version data to pathout_tar via appendArgTar()
 magicProcessWriteBuffer() {
     # Desc: process and write buffer
-    # In : vars: bufferTTL bufferTTL_STR scriptHostname label dir_tmp SECONDS
+    # In : vars: bufferTTL scriptHostname label dir_tmp SECONDS
+    #    : vars: timeBufferStartEpoch timeBufferEndEpoch
     #    : arry: buffer
     # Out: file:(pathout_tar)
     # Depends: Bash 5.0.3, date 8.30, yell(), vbm(), dateTimeShort(),
     ### Note: These arrays should all have the same number of elements:
     ###       pathouts, fileouts, procFileExts, procStrings
     
-    local fn timeBufferStartLong timeBufferStart fileoutBasename
+    local fn timeBufferStartLong timeBufferStart bufferDuration bufferDurationStr fileoutBasename
     local -a fileouts pathouts
     local writeCmd1 writeCmd2 writeCmd3 writeCmd4
 
@@ -1236,12 +1240,17 @@ magicProcessWriteBuffer() {
     
     # Determine file paths (time is start of buffer period)
     ## Calculate start time
-    timeBufferStartLong="$(date --date="$bufferTTL seconds ago" --iso-8601=seconds)" && \
-	vbm "DEBUG :$fn:timeBufferStartLong:$timeBufferStartLong";
+    timeBufferStartLong="$(date --date="@$timeBufferStartEpoch" --iso-8601=seconds)" && \
+	vbm "DEBUG :$fn:timeBufferStartLong:$timeBufferStartLong"; # Note start time in 'date' parsable ISO-8601
     timeBufferStart="$(dateTimeShort "$timeBufferStartLong" )" && \
 	vbm "DEBUG :$fn:timeBufferStart:$timeBufferStart"; # Note start time YYYYmmddTHHMMSS+zzzz (no separators)
+    ## Calculate buffer duration string (ISO-8601 duration)
+    bufferDuration="$((timeBufferEndEpoch - timeBufferStartEpoch))" && \
+	vbm "DEBUG :$fn:bufferDuration:$bufferDuration"; # length of time (seconds) stdin was read
+    bufferDurationStr="$(timeDuration "$bufferDuration")" && \
+	vbm "DEBUG :$fn:bufferDurationStr:$bufferDurationStr"; # buffer duration (ISO-8601)
     ## Set common basename
-    fileoutBasename="$timeBufferStart""--""$bufferTTL_STR""..""$scriptHostname""$label" && \
+    fileoutBasename="$timeBufferStart""--""$bufferDurationStr""..""$scriptHostname""$label" && \
 	vbm "STATUS:$fn:Set fileoutBasename to:$fileoutBasename";
     ## Determine output file name array
     ### in: fileOutBasename cmd_compress_suffix cmd_encrypt_suffix procFileExts
@@ -1397,8 +1406,14 @@ main() {
     # Perform secondary setup operations
     ## Set script lifespan (scriptTTL from scriptTTL_TE)
     magicSetScriptTTL "$scriptTTL_TE";
-    ## File name substring (ISO-8601 duration from bufferTTL)
-    bufferTTL_STR="$(timeDuration "$bufferTTL")" && vbm "DEBUG :$fn:bufferTTL_STR:$bufferTTL_STR";
+    ## Adjust SECONDS so buffer rounds align with time elements
+    ### Advance SECONDS the remainder seconds for dividend timeUntilNextDay, divisor bufferTTL
+    if [[ "$(timeUntilNextDay)" -gt "$bufferTTL" ]]; then
+	vbm "DEBUG :$fn:SECONDS currently  :$SECONDS";
+	SECONDS="$(( $(timeUntilNextDay) % bufferTTL ))" && \
+	    vbm "DEBUG :$fn:SECONDS advanced to:$SECONDS";
+	vbm "DEBUG :$fn:current time:$(date --iso-8601=seconds)";
+    fi;
     ## Init temp working dir
     try mkdir "$dir_tmp" && vbm "DEBUG :$fn:Working dir created at dir_tmp:$dir_tmp";
     ## Initialize output tar (set pathout_tar)
@@ -1415,12 +1430,16 @@ main() {
     bufferRound=0;
     while [[ $SECONDS -lt "scriptTTL" ]]; do
 	vbm "STATUS:$fn:Starting buffer round:$bufferRound";
-	bufferTOD="$((SECONDS + bufferTTL))"; # Set buffer round time-of-death
+	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
+	timeBufferEndEpoch="$(date +%s)" && vbm "DEBUG :$fn:timeBufferEndEpoch:$timeBufferEndEpoch";
 	# Create dir_tmp if missing
 	if ! [[ -d "$dir_tmp" ]]; then
 	    yell "ERROR:$fn:dir_tmp existence failure:$dir_tmp";