Permalink
Browse files

Merge pull request #1049 from lonnen/34-stage

34 stage
  • Loading branch information...
2 parents faf8e17 + 3cf6061 commit ec6bdf4697187f9ba8db188dc0a95cb71786bfc2 @lonnen lonnen committed Jan 15, 2013
Showing with 6 additions and 4 deletions.
  1. +1 −1 scripts/crons/cron_libraries.sh
  2. +2 −0 scripts/crons/cron_submitter.sh
  3. +3 −3 socorro/external/hbase/hbase_client.py
@@ -69,7 +69,7 @@ do
techo "Phase 1: end"
done
-MANUAL_VERSION_OVERRIDE="18.0 19.0a2 20.0a1"
+MANUAL_VERSION_OVERRIDE="19.0 20.0a2 21.0a1"
techo "Phase 2: start"
for I in Firefox
do
@@ -27,6 +27,8 @@ function submit_dump() {
. /etc/socorro/socorro-monitor.conf
OOID=$1
+ date
+ echo $OOID
python ${APPDIR}/socorro/external/hbase/hbase_client.py -h $hbaseHost get_json $OOID > /tmp/$OOID.json
python ${APPDIR}/socorro/external/hbase/hbase_client.py -h $hbaseHost get_dump $OOID > /tmp/$OOID.dump
python ${APPDIR}/socorro/collector/submitter.py -j /tmp/$OOID.json -d /tmp/$OOID.dump -u $CRASH_REPORT_URL
@@ -193,7 +193,7 @@ def f(self, *args, **kwargs):
# drop and remake connection
except self.hbaseThriftExceptions, x:
self.logger.debug(
- 'retry_wrapper: handled exception, %s',
+ 'hbase client retry_wrapper: handled exception, %s',
str(x)
)
if not countdown:
@@ -204,12 +204,12 @@ def f(self, *args, **kwargs):
self.close()
except self.hbaseThriftExceptions:
pass
- self.logger.debug('retry_wrapper: about to retry connection')
+ self.logger.debug('hbase client retry_wrapper: about to retry connection')
self.make_connection(timeout=self.timeout)
# unknown error - abort
except Exception, x:
self.logger.debug(
- 'retry_wrapper: unhandled exception, %s',
+ 'hbase client retry_wrapper: unhandled exception, %s',
str(x)
)
raise

0 comments on commit ec6bdf4

Please sign in to comment.