Skip to content

Commit

Permalink
automatically start postgres during wireup
Browse files Browse the repository at this point in the history
  • Loading branch information
Changaco committed Dec 21, 2016
1 parent 83f3942 commit c48f8de
Showing 1 changed file with 22 additions and 4 deletions.
26 changes: 22 additions & 4 deletions liberapay/wireup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import logging
import os
import re
from subprocess import check_call
import traceback

from six import text_type as str
Expand All @@ -16,6 +17,7 @@
from babel.numbers import parse_pattern
from environment import Environment, is_yesish
from mailshake import DummyMailer, SMTPMailer
import psycopg2
import raven

from liberapay import elsewhere
Expand Down Expand Up @@ -49,10 +51,25 @@ def canonical(env):
return locals()


def db(env):
def database(env, tell_sentry, retry=True):
dburl = env.database_url
maxconn = env.database_maxconn
db = DB(dburl, maxconn=maxconn)
try:
db = DB(dburl, maxconn=maxconn)
except psycopg2.OperationalError:
pg_dir = os.environ.get('OPENSHIFT_PG_DATA_DIR')
if not pg_dir:
# We're not in production, let the developer deal with it.
raise
if not retry:
# Give up
raise
try:
check_call(['pg_ctl', '-D', pg_dir, 'start', '-w', '-t', '120'])
except Exception as e:
tell_sentry(e, {})
raise
return database(env, tell_sentry, retry=False)

for model in (AccountElsewhere, Community, ExchangeRoute, Participant):
db.register_model(model)
Expand Down Expand Up @@ -408,13 +425,14 @@ def env():

minimal_algorithm = Algorithm(
env,
db,
make_sentry_teller,
database,
)

full_algorithm = Algorithm(
env,
db,
make_sentry_teller,
database,
canonical,
app_conf,
mail,
Expand Down

0 comments on commit c48f8de

Please sign in to comment.