Skip to content

Commit ee8e62b

Browse files
committed
status.json should work even if not configured correctly
1 parent 152fe30 commit ee8e62b

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

regexplanet-api.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,19 @@ def get(self):
111111
add_if_exists(retVal, "sys.maxsize", sys.maxsize)
112112
add_if_exists(retVal, "sys.maxunicode", sys.maxunicode)
113113
add_if_exists(retVal, "sys.version", sys.version)
114+
115+
if "DATABASE_URL" in os.environ:
114116

115-
cols, rows = do_query("SELECT version(), current_setting('server_version'), current_setting('server_version_num');", None)
116-
dbdetail = rows[0][0] if len(rows) > 0 else None
117-
dbversion = rows[0][1] if len(rows) > 0 else None
118-
dbversionnum = rows[0][2] if len(rows) > 0 else None
119-
retVal["version"] = dbversion
117+
cols, rows = do_query("SELECT version(), current_setting('server_version'), current_setting('server_version_num');", None)
118+
dbdetail = rows[0][0] if len(rows) > 0 else None
119+
dbversion = rows[0][1] if len(rows) > 0 else None
120+
dbversionnum = rows[0][2] if len(rows) > 0 else None
121+
retVal["version"] = dbversion
120122

121-
add_if_exists(retVal, "SELECT version();", dbdetail)
122-
add_if_exists(retVal, "SELECT current_setting('server_version_num');", dbversionnum)
123+
add_if_exists(retVal, "SELECT version();", dbdetail)
124+
add_if_exists(retVal, "SELECT current_setting('server_version_num');", dbversionnum)
125+
else:
126+
add_if_exists(retVal, "Database", "NOT CONFIGURED")
123127

124128
self.response.headers['Content-Type'] = 'text/plain'
125129

@@ -299,4 +303,4 @@ def get(self):
299303

300304
if __name__ == '__main__':
301305
from paste import httpserver
302-
httpserver.serve(app, host='127.0.0.1', port='8080')
306+
httpserver.serve(app, host='0.0.0.0', port='8080')

0 commit comments

Comments
 (0)