Skip to content

Commit 29fae29

Browse files
CamDavidsonPilonCamDavidsonPilon
committed
fix for More lgs
1 parent bb30ff1 commit 29fae29

File tree

8 files changed

+120
-110
lines changed

8 files changed

+120
-110
lines changed

‎asset-manifest.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"files": {
33
"main.css": "/static/css/main.02152627.css",
4-
"main.js": "/static/js/main.7169a98f.js",
4+
"main.js": "/static/js/main.1d7a20c2.js",
55
"static/media/roboto-all-500-normal.woff": "/static/media/roboto-all-500-normal.0ab669b7a0d19b178f57.woff",
66
"static/media/roboto-all-700-normal.woff": "/static/media/roboto-all-700-normal.a457fde362a540fcadff.woff",
77
"static/media/roboto-all-400-normal.woff": "/static/media/roboto-all-400-normal.c5d001fa922fa66a147f.woff",
@@ -36,10 +36,10 @@
3636
"static/media/roboto-greek-ext-700-normal.woff2": "/static/media/roboto-greek-ext-700-normal.bd9854c751441ccc1a70.woff2",
3737
"index.html": "/index.html",
3838
"main.02152627.css.map": "/static/css/main.02152627.css.map",
39-
"main.7169a98f.js.map": "/static/js/main.7169a98f.js.map"
39+
"main.1d7a20c2.js.map": "/static/js/main.1d7a20c2.js.map"
4040
},
4141
"entrypoints": [
4242
"static/css/main.02152627.css",
43-
"static/js/main.7169a98f.js"
43+
"static/js/main.1d7a20c2.js"
4444
]
4545
}

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Pioreactor"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><script defer="defer" src="/static/js/main.7169a98f.js"></script><link href="/static/css/main.02152627.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
1+
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Pioreactor"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><script defer="defer" src="/static/js/main.1d7a20c2.js"></script><link href="/static/css/main.02152627.css" rel="stylesheet"></head><body><div id="root"></div></body></html>

‎pioreactorui/__init__.py‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,17 @@ def _make_dicts(cursor, row) -> dict:
169169
def _get_app_db_connection():
170170
db = getattr(g, "_app_database", None)
171171
if db is None:
172-
db = g._app_database = sqlite3.connect(pioreactor_config.get("storage", "database"))
172+
try:
173+
db = g._app_database = sqlite3.connect(pioreactor_config.get("storage", "database"))
174+
except sqlite3.OperationalError as e:
175+
if "database is locked" in str(e):
176+
logger.error("Database is locked, please close any other connections or restart.")
177+
elif "unable to open database file" in str(e):
178+
logger.error(
179+
"Permissions on database are probably incorrect, ownership should be pioreactor:www-data on all sqlite files."
180+
)
181+
raise e
182+
173183
db.create_function(
174184
"BASE64", 1, decode_base64
175185
) # TODO: until next OS release which implements a native sqlite3 base64 function
@@ -199,7 +209,6 @@ def _get_temp_local_metadata_db_connection():
199209
"""
200210
PRAGMA temp_store = 2; -- stop writing small files to disk, use mem
201211
PRAGMA busy_timeout = 15000;
202-
PRAGMA foreign_keys = ON;
203212
PRAGMA cache_size = -4000;
204213
"""
205214
)

‎pioreactorui/tasks.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
"DEBUG",
6363
"MODEL_NAME",
6464
"MODEL_VERSION",
65+
"SKIP_PLUGINS",
6566
)
6667

6768

‎static/js/main.1d7a20c2.js‎

Lines changed: 103 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/js/main.7169a98f.js.LICENSE.txt renamed to static/js/main.1d7a20c2.js.LICENSE.txt

File renamed without changes.

static/js/main.7169a98f.js.map renamed to static/js/main.1d7a20c2.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/js/main.7169a98f.js‎

Lines changed: 0 additions & 103 deletions
This file was deleted.

0 commit comments

Comments
 (0)