simon/smeagol
1
0
Fork 0
mirror of https://github.com/journeyman-cc/smeagol.git synced 2026-04-12 18:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Simon Brooke 2020-02-07 19:01:47 +00:00
commit 7ddff8434a
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/templates/wiki.html
View file

@ -6,7 +6,7 @@
package for vega-embed, so we're currently not installing either it or Vega locally. package for vega-embed, so we're currently not installing either it or Vega locally.
TODO: fix --> TODO: fix -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/vega/3.0.0-rc2/vega.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/vega/3.0.0-rc2/vega.js"></script>
{% script "vendor/vega-lite/build/vega-lite.js" %} {% script "/vendor/vega-lite/build/vega-lite.js" %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/vega-embed/3.0.0-beta.19/vega-embed.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/vega-embed/3.0.0-beta.19/vega-embed.js"></script>
{% script "vendor/mermaid/dist/mermaid.js" %} {% script "vendor/mermaid/dist/mermaid.js" %}

12
src/smeagol/configuration.clj
View file

@ -111,9 +111,19 @@
file is read (if it is specified and present), but that individual file is read (if it is specified and present), but that individual
values can be overridden by environment variables." values can be overridden by environment variables."
(try (try
(timbre/info (str "Reading configuration from " config-file-path))
(let [file-contents (try (let [file-contents (try
(read-string (slurp config-file-path)) (read-string (slurp config-file-path))
(catch Exception _ {})) (catch Exception x
(timbre/error
(str
"Failed to read configuration from "
config-file-path
" because: "
(type x)
"; "
(.getMessage x)))
{}))
config (merge config (merge
file-contents file-contents
(transform-map (transform-map