Skip to content

Commit

Permalink
Adding some better debug output
Browse files Browse the repository at this point in the history
Adding pika to requirements
Add more logging to submitter in integration test
Added parameters to rabbitmq to override for jenkins in build.sh
  • Loading branch information
selenamarie committed Jun 11, 2013
1 parent 0e8dd72 commit 45496dc
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 2 deletions.
1 change: 1 addition & 0 deletions requirements/prod.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ suds==0.4
thrift==0.8.0
web.py==0.36
requests==1.2.3
pika==0.9.8
2 changes: 2 additions & 0 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ fi
# Override hostnames for jenkins
export DB_HOST="jenkins-pg92"
export RABBITMQ_HOST="rabbitmq-zlb.webapp.phx1.mozilla.com"
export RABBITMQ_USERNAME="socorro-jenkins"
export RABBITMQ_PASSWORD="aPassword"

# RHEL postgres 9 RPM installs pg_config here, psycopg2 needs it
export PATH=/usr/pgsql-9.2/bin:$PATH
Expand Down
17 changes: 15 additions & 2 deletions scripts/rabbitmq-integration-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ then
exit 1
fi


if [ -z "$DB_HOST" ]
then
DB_HOST="localhost"
Expand All @@ -35,6 +36,16 @@ then
RABBITMQ_HOST="localhost"
fi

if [ -z "$RABBITMQ_USERNAME" ]
then
RABBITMQ_USERNAME="guest"
fi

if [ -z "$RABBITMQ_PASSWORD" ]
then
RABBITMQ_PASSWORD="guest"
fi

function cleanup() {
echo "INFO: cleaning up crash storage directories"
rm -rf ./primaryCrashStore/ ./processedCrashStore/
Expand Down Expand Up @@ -108,8 +119,8 @@ done
echo " Done."

echo -n "INFO: starting up collector, processor and middleware..."
python socorro/collector/collector_app.py --admin.conf=./config/rabbitmq-collector.ini --storage.storage1.host=$RABBITMQ_HOST > collector.log 2>&1 &
python socorro/processor/processor_app.py --admin.conf=./config/rabbitmq-processor.ini --new_crash_source.host=$RABBITMQ_HOST > processor.log 2>&1 &
python socorro/collector/collector_app.py --admin.conf=./config/rabbitmq-collector.ini --storage.storage1.host=$RABBITMQ_HOST --storage.storage1.rabbitmq_user=$RABBITMQ_USERNAME --storage.storage1.rabbitmq_password=$RABBITMQ_PASSWORD > collector.log 2>&1 &
python socorro/processor/processor_app.py --admin.conf=./config/rabbitmq-processor.ini --new_crash_source.host=$RABBITMQ_HOST --new_crash_source.rabbitmq_user=$RABBITMQ_USERNAME --new_crash_source.rabbitmq_password=$RABBITMQ_PASSWORD > processor.log 2>&1 &
sleep 1
python socorro/middleware/middleware_app.py --admin.conf=./config/rabbitmq-middleware.ini --database.database_host=$DB_HOST > middleware.log 2>&1 &
echo " Done."
Expand All @@ -127,6 +138,7 @@ function retry() {
echo "INFO: waiting for $name..."
if [ $count == 30 ]
then
cat $name.log
fatal 1 "$name timeout"
fi
else
Expand Down Expand Up @@ -158,6 +170,7 @@ echo " Done."
CRASHID=`grep 'CrashID' submitter.log | awk -FCrashID=bp- '{print $2}'`
if [ -z "$CRASHID" ]
then
cat submitter.log
fatal 1 "no crash ID found in submitter log"
fi

Expand Down

0 comments on commit 45496dc

Please sign in to comment.