From 73aec913ae5c7e6a846569ed230c9c436cebf8e5 Mon Sep 17 00:00:00 2001 From: Eric MacDonald Date: Tue, 31 Jan 2023 23:38:18 +0000 Subject: [PATCH] Revert "Warn about invalid date when collecting logs" This reverts commit 59450af179bb67c3784b916b5eba38fc08531a05. Reason for revert: Collect will fail unless an end date is specified. The end date defaults to 'any' and that is caught as an invalid time in the newly added error check. Change-Id: I614add5409ba974d00b83d8af5d2911b28533acd --- tools/collector/debian-scripts/collect | 17 ----------------- tools/collector/debian-scripts/collect_utils | 4 ---- tools/collector/scripts/collect | 16 ---------------- tools/collector/scripts/collect_utils | 3 --- 4 files changed, 40 deletions(-) diff --git a/tools/collector/debian-scripts/collect b/tools/collector/debian-scripts/collect index e74b2d44..aa3bc6a9 100755 --- a/tools/collector/debian-scripts/collect +++ b/tools/collector/debian-scripts/collect @@ -759,23 +759,6 @@ while [[ ${#} -gt 0 ]] ; do done -date -d $STARTDATE > /dev/null 2>/dev/null -rc_start_date=${?} -date -d $ENDDATE > /dev/null 2>/dev/null -rc_end_date=${?} - -if [ $rc_start_date != 0 ] ; then - report_error "the start date is invalid" ${FAIL_INVALID_START_DATE} - collect_exit ${FAIL_INVALID_START_DATE} -elif [ $rc_end_date != 0 ] ; then - report_error "the end date is invalid" ${FAIL_INVALID_END_DATE} - collect_exit ${FAIL_INVALID_END_DATE} -elif (( $STARTDATE > $ENDDATE )) ; then - report_error "the start date is greater than the end date" ${FAIL_INVALID_DATE_RANGE} - collect_exit ${FAIL_INVALID_DATE_RANGE} -fi - - # startup state debug logs dlog "${TOOL_NAME} ver ${TOOL_REV}.${TOOL_REV} (pid:$$)" dlog "USERNAME = ${USER}" diff --git a/tools/collector/debian-scripts/collect_utils b/tools/collector/debian-scripts/collect_utils index 4a2af19c..95f634e6 100755 --- a/tools/collector/debian-scripts/collect_utils +++ b/tools/collector/debian-scripts/collect_utils @@ -54,10 +54,6 @@ FAIL_CONTINUE=51 FAIL_SUBCLOUDNAME=52 FAIL_NO_SUBCLOUDS=53 FAIL_NOT_SYSTEMCONTROLLER=54 -FAIL_NAME_TOO_LONG=55 -FAIL_INVALID_START_DATE=56 -FAIL_INVALID_END_DATE=57 -FAIL_INVALID_DATE_RANGE=58 # Warnings are above 200 diff --git a/tools/collector/scripts/collect b/tools/collector/scripts/collect index 46aa0281..1101135f 100755 --- a/tools/collector/scripts/collect +++ b/tools/collector/scripts/collect @@ -767,22 +767,6 @@ while [[ ${#} -gt 0 ]] ; do shift # past argument or value done -date -d $STARTDATE > /dev/null 2>/dev/null -rc_start_date=${?} -date -d $ENDDATE > /dev/null 2>/dev/null -rc_end_date=${?} - -if [ $rc_start_date != 0 ] ; then - report_error "the start date is invalid" ${FAIL_INVALID_START_DATE} - collect_exit ${FAIL_INVALID_START_DATE} -elif [ $rc_end_date != 0 ] ; then - report_error "the end date is invalid" ${FAIL_INVALID_END_DATE} - collect_exit ${FAIL_INVALID_END_DATE} -elif (( $STARTDATE > $ENDDATE )) ; then - report_error "the start date is greater than the end date" ${FAIL_INVALID_DATE_RANGE} - collect_exit ${FAIL_INVALID_DATE_RANGE} -fi - # startup state debug logs dlog "${TOOL_NAME} ver ${TOOL_REV}.${TOOL_REV} (pid:$$)" diff --git a/tools/collector/scripts/collect_utils b/tools/collector/scripts/collect_utils index ef3d8d63..71e867fc 100755 --- a/tools/collector/scripts/collect_utils +++ b/tools/collector/scripts/collect_utils @@ -55,9 +55,6 @@ FAIL_SUBCLOUDNAME=52 FAIL_NO_SUBCLOUDS=53 FAIL_NOT_SYSTEMCONTROLLER=54 FAIL_NAME_TOO_LONG=55 -FAIL_INVALID_START_DATE=56 -FAIL_INVALID_END_DATE=57 -FAIL_INVALID_DATE_RANGE=58 # Warnings are above 200