diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2020-05-30 19:49:56 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2020-05-30 19:49:56 -0400 |
| commit | c2f1e1096f602b1cbd4531352f3e1ea6d656a186 (patch) | |
| tree | ae102982878bb0c31bdfe07209e60bfc14030490 /src/demo.sml | |
| parent | 095c2640aa2070ed4e2765875238d5e6e6673856 (diff) | |
| parent | 5a0b639dfbd7db9d16c6995f72ba17152a1f362d (diff) | |
Merge branch 'upstream' into dfsg_clean20200209+dfsgdfsg_clean
Diffstat (limited to 'src/demo.sml')
| -rw-r--r-- | src/demo.sml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/demo.sml b/src/demo.sml index 1e58e2f8..ef57e65b 100644 --- a/src/demo.sml +++ b/src/demo.sml @@ -98,6 +98,10 @@ fun make' {prefix, dirname, guided} = NONE => OS.Path.joinDirFile {dir = dirname, file = "demo.sql"} | SOME s => s), + endpoints = SOME (case Settings.getEndpoints () of + NONE => OS.Path.joinDirFile {dir = dirname, + file = "demo-endpoints.json"} + | SOME e => e), debug = Settings.getDebug (), timeout = Int.max (#timeout combined, #timeout urp), profile = false, @@ -124,6 +128,7 @@ fun make' {prefix, dirname, guided} = dbms = mergeWith #2 (#dbms combined, #dbms urp), sigFile = mergeWith #2 (#sigFile combined, #sigFile urp), fileCache = mergeWith #2 (#fileCache combined, #fileCache urp), + safeGetDefault = #safeGetDefault combined orelse #safeGetDefault urp, safeGets = #safeGets combined @ #safeGets urp, onError = NONE, minHeap = 0, |