Skip to content

Commit 65fc58d

Browse files
CamDavidsonPilonCamDavidsonPilon
committed
5s to allow for events happening after an unassingment to still prop
1 parent 374d036 commit 65fc58d

File tree

8 files changed

+14
-13
lines changed

8 files changed

+14
-13
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.30e2dfd3.js",
4+
"main.js": "/static/js/main.f7cdb1ed.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.30e2dfd3.js.map": "/static/js/main.30e2dfd3.js.map"
39+
"main.f7cdb1ed.js.map": "/static/js/main.f7cdb1ed.js.map"
4040
},
4141
"entrypoints": [
4242
"static/css/main.02152627.css",
43-
"static/js/main.30e2dfd3.js"
43+
"static/js/main.f7cdb1ed.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.30e2dfd3.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.f7cdb1ed.js"></script><link href="/static/css/main.02152627.css" rel="stylesheet"></head><body><div id="root"></div></body></html>

‎pioreactorui/api.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ def get_exp_logs(experiment: str) -> ResponseReturnValue:
381381
JOIN experiment_worker_assignments_history h
382382
on h.pioreactor_unit = l.pioreactor_unit
383383
and h.assigned_at <= l.timestamp
384-
and l.timestamp <= coalesce(h.unassigned_at, STRFTIME('%Y-%m-%dT%H:%M:%f000Z', 'NOW'))
384+
and l.timestamp <= coalesce(h.unassigned_at, STRFTIME('%Y-%m-%dT%H:%M:%f000Z', 'NOW', '+5 seconds'))
385385
WHERE (l.experiment=? )
386386
AND ({get_level_string(min_level)})
387387
ORDER BY l.timestamp DESC LIMIT 50 OFFSET {skip};""",
@@ -446,7 +446,7 @@ def get_logs_for_unit_and_experiment(pioreactor_unit: str, experiment: str) -> R
446446
JOIN experiment_worker_assignments_history h
447447
on h.pioreactor_unit = l.pioreactor_unit
448448
and h.assigned_at <= l.timestamp
449-
and l.timestamp <= coalesce(h.unassigned_at, STRFTIME('%Y-%m-%dT%H:%M:%f000Z', 'NOW') )
449+
and l.timestamp <= coalesce(h.unassigned_at, STRFTIME('%Y-%m-%dT%H:%M:%f000Z', 'NOW', '+5 seconds') )
450450
WHERE (l.experiment=? or l.experiment=?)
451451
AND (l.pioreactor_unit=? or l.pioreactor_unit=?)
452452
AND ({get_level_string(min_level)})

‎pioreactorui/config.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import os
99
import sqlite3
10-
import tempfile
1110
from pathlib import Path
1211

1312
from dotenv import dotenv_values
@@ -18,7 +17,9 @@ def is_testing_env():
1817
return os.environ.get("TESTING") == "1"
1918

2019

21-
CACHE_DIR = Path(tempfile.gettempdir()) / "pioreactor_cache"
20+
CACHE_DIR = (
21+
Path("/tmp") / "pioreactor_cache"
22+
) # sucks that is hardcoded - I don't have a config for this location.
2223

2324
env = dotenv_values(".env", verbose=True)
2425

‎static/js/main.30e2dfd3.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

static/js/main.30e2dfd3.js renamed to static/js/main.f7cdb1ed.js

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

static/js/main.30e2dfd3.js.LICENSE.txt renamed to static/js/main.f7cdb1ed.js.LICENSE.txt

File renamed without changes.

‎static/js/main.f7cdb1ed.js.map‎

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

0 commit comments

Comments
 (0)