GitList

Browse code

fix warn function

The warn function was putting content into a side log file which made
it kind of hard to keep an eye on when warnings were actually being
issued. Let's just get this into the main output stream.

The calling of the warn function in git_timed was also incorrect, so
the output would not have been what we expected. This solves that as
well.

This will hopefully give us trackable data about how often we need to
recover from git clone errors.

Change-Id: Iee0d2df7fb788a4d34044d29ab10afdcafb9bb5a

Sean Dague authored on 2015/04/28 21:57:57
Showing 1 changed files

functions-common

History View file @ e4af929

@@ -174,10 +174,7 @@ function warn {
                          local xtrace=$(set +o | grep xtrace)
                          set +o xtrace
                          local msg="[WARNING] ${BASH_SOURCE[2]}:$1 $2"
                     -    echo $msg 1>&2;
                     -    if [[ -n ${LOGDIR} ]]; then
                     -        echo $msg >> "${LOGDIR}/error.log"
                     -    fi
                     +    echo $msg
                          $xtrace
                          return $exitcode
+                     }
@@ -509,7 +506,7 @@ function git_timed {
                              fi
                              count=$(($count + 1))
                     -        warn "timeout ${count} for git call: [git $@]"
                     +        warn $LINENO "timeout ${count} for git call: [git $@]"
                              if [ $count -eq 3 ]; then
                                  die $LINENO "Maximum of 3 git retries reached"
                              fi