Clean up logging

rsc_log_backup.sh

@@ -7,7 +7,7 @@
 #
 # usage: rsc_log_backup.sh [filter]
 
-usage() { echo "Usage: $0 [filter]" 1>&2; exit 1; }
+usage() { log_error "Usage: $0 [filter]"; exit 1; }
 
 if [[ -z "$1" ]]; then
     usage
@@ -15,6 +15,19 @@ fi
 
 MYDIR="$(dirname "$(realpath "$0")")"
 
+# Support -v/--verbose and strip it from positional args
+NEWARGS=()
+for arg in "$@"; do
+    case "$arg" in
+        -v|--verbose)
+            VERBOSE=1
+            ;;
+        *)
+            NEWARGS+=("$arg")
+            ;;
+    esac
+done
+set -- "${NEWARGS[@]}"
 # source $MYDIR/rbk_api.conf
 source $MYDIR/rsc_ops.sh
 
@@ -57,13 +70,13 @@ cdmId=$(cat /tmp/rbkresponse.$$ | jq -r '.data.oracleDatabases.nodes[] | .cluste
 # Check for multiple dbids
 dbid_count=$(echo "$dbid" | wc -l)
 if [[ "$dbid_count" -ne 1 || -z "$dbid" ]]; then
-    echo "ERROR: Expected exactly one database match! found:"
+    log_error "Expected exactly one database match! found:"
     cat /tmp/rbkresponse.$$ | jq -r '.data.oracleDatabases.nodes[] | .dbUniqueName'
     cleanup
     exit 4
 fi
 
-echo "DEBUG: DB ID is $dbid"
+log_info "DB ID is $dbid"
 variables="{
 \"input\": {
 \"id\": \"$dbid\"
@@ -81,8 +94,8 @@ gqlVars="$(echo $variables)"
 rsc_gql_query
 
 # Save the id from the response
+log_info "Log backup job id: $(cat /tmp/rbkresponse.$$ | jq -r '.data.takeOnDemandOracleLogSnapshot.id')"
 log_backup_id=$(cat /tmp/rbkresponse.$$ | jq -r '.data.takeOnDemandOracleLogSnapshot.id')
-echo "DEBUG: Job id is $log_backup_id"
 
 gqlCheckStatus='query OracleDatabaseAsyncRequestDetails($input: GetOracleAsyncRequestStatusInput!) {
   oracleDatabaseAsyncRequestDetails(input: $input) {
@@ -113,17 +126,17 @@ while true; do
     status=$(cat /tmp/rbkresponse.$$ | jq -r '.data.oracleDatabaseAsyncRequestDetails.status')
     progress=$(cat /tmp/rbkresponse.$$ | jq -r '.data.oracleDatabaseAsyncRequestDetails.progress')
 
-    echo "Job status: $status $progress percent"
+    log_info "Job status: $status $progress percent"
     if [[ "$status" == "FAILED" ]]; then
-        echo "Log backup FAILED"
+        log_error "Log backup FAILED"
         cat /tmp/rbkresponse.$$ | jq
         cleanup
         exit 2
     elif [[ "$status" == "CANCELLED" ]]; then
-        echo "Log backup CANCELLED"
+        log_warn "Log backup CANCELLED"
         exit 3
     elif [[ "$status" == "SUCCEEDED" ]]; then
-        echo "Log backup SUCCEEDED"
+        log_info "Log backup SUCCEEDED"
         cat /tmp/rbkresponse.$$ | jq
         cleanup
         exit 0