URLs generated by wrap-trace middleware should be aware of the context #142
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…t under which it is deployed.
|
Thanks for the PR. I will have to investigate as I do not yet fully understand the implications of the issue and the PR. |
ordnungswidrig
requested changes
Sep 16, 2016
| [:span (h request-method)] " " [:span (h uri)]] | ||
| [:span " at " [:span (h d)] " " [:span "(" (seconds-ago d) "s ago)"]]]) @logs)])]))) | ||
|
|
||
| (defn css-url [] (str (with-slash mount-url) "styles.css")) | ||
| (defn css-url [] (str (with-slash (str *context* mount-url)) "styles.css")) |
There was a problem hiding this comment.
Instead of dynamic binding I'd prefer an explicit argument.
| ""])] | ||
| [:body | ||
| [:a {:href mount-url} "List of all traces"] | ||
| [:a {:href (str *context* mount-url)} "List of all traces"] |
There was a problem hiding this comment.
Use the :context from the request instead and (let [base-url (str (:context request) "/" mount-url))] ...)
| @@ -94,10 +102,10 @@ | |||
| [:ol (map (fn [[l [n r]]] [:li (h l) ": " (h n) " " | |||
| (if (nil? r) [:em "nil"] (h (pr-str r)))]) log)] | |||
| [:div {:style "text-align: center;"} | |||
| [:object {:id "trace" :data (str mount-url "trace.svg") :width "90%" | |||
| [:object {:id "trace" :data (str *context* mount-url "trace.svg") :width "90%" | |||
| @@ -114,11 +122,11 @@ | |||
| (html5 [:head [:title "Liberator Request Trace #" id " not found."]] | |||
| [:body [:h1 "Liberator Request Trace #" id " not found."] | |||
| [:p "The requested trace was not found. Maybe it is expired."] | |||
| [:p "You can access a " [:a {:href mount-url} "list of traces"] "."]]))) | |||
| [:p "You can access a " [:a {:href (str *context* mount-url)} "list of traces"] "."]]))) | |||
| @@ -132,11 +140,11 @@ | |||
| " header in the http response."]] | |||
| [:ol (map (fn [[id [d {:keys [request-method uri]} log]]] | |||
| [:ul | |||
| [:a {:href (h (str (with-slash mount-url) id))} | |||
| [:a {:href (h (str (with-slash (str *context* mount-url)) id))} | |||
| @@ -145,7 +153,7 @@ | |||
| "Build the url under which the trace information can be found for the | |||
| given trace id" | |||
| [id] | |||
| (str (with-slash mount-url) id)) | |||
| (str (with-slash (str *context* mount-url)) id)) | |||
|
@ray1729 I realize that this PR is a little old, but still valuable. If you don't want to participate in it any more simply let me know and I'm going to clean it up myself :-) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The liberator.dev/wrap-trace middleware was generating URLS at /x-liberator/requests/ which only works when the handler is installed at the root context. This pull request adds support for handlers deployed under any context, and generates URLs relative to the context.