Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

allow scheme to be specified for elasticsearch http connections #87

Merged
merged 1 commit into from
Mar 31, 2016
Merged

allow scheme to be specified for elasticsearch http connections #87

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions joplin.elasticsearch/src/joplin/elasticsearch/database.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@
;; ============================================================================
;; Functions for use within migrations

(defn client [{:keys [host port]}]
(es/connect (str "http://" host ":" port)))
(defn client [{:keys [scheme host port] :or {scheme "http"}}]
(es/connect (str scheme "://" host ":" port)))

(defn native-client [{:keys [host port native-port cluster]}]
(let [es-port (or native-port port)]
Expand Down