diff --git a/mbeanz/mbeanz b/mbeanz/mbeanz index f8921ed..9a66ad7 100755 --- a/mbeanz/mbeanz +++ b/mbeanz/mbeanz @@ -5,7 +5,8 @@ import json import requests import subprocess32 -api_url = 'http://localhost:7999' +port = [line.rstrip('\n') for line in open('/var/tmp/mbeanz.port')][0] +api_url = 'http://localhost:' + port class colors: OKGREEN = '\033[92m' diff --git a/mbeanz/requirements.txt b/mbeanz/requirements.txt index d9c97c7..1e2d57a 100644 --- a/mbeanz/requirements.txt +++ b/mbeanz/requirements.txt @@ -1,18 +1,2 @@ -enum34==1.0.4 -futures==3.0.3 -greenlet==0.4.7 -httpie==0.9.2 -msgpack-python==0.4.6 -neovim==0.0.37 -pep8==1.5.6 -powerline-status==2.1 -pyflakes==0.8.1 -Pygments==2.0.2 -pyzmq==14.1.1 requests==2.7.0 -speedtest-cli==0.2.5 subprocess32==3.2.6 -trollius==2.0 -vboxapi==1.0 -virtualenv==13.1.2 -wheel==0.24.0 diff --git a/project.clj b/project.clj index f130e53..d0c0c37 100644 --- a/project.clj +++ b/project.clj @@ -7,7 +7,7 @@ [org.clojure/core.match "0.3.0-alpha4"] [compojure "1.3.4"] [ring.middleware.logger "0.5.0"] - [http-kit "2.0.0"] + [http-kit "2.1.17"] [ring/ring-mock "0.3.0"] [ring/ring-defaults "0.1.2"] [ring/ring-json "0.4.0"] diff --git a/src/mbeanz/handler.clj b/src/mbeanz/handler.clj index 45094eb..354c256 100644 --- a/src/mbeanz/handler.clj +++ b/src/mbeanz/handler.clj @@ -9,9 +9,12 @@ [environ.core :refer [env]] [clojure.java.jmx :as jmx]) (:use [org.httpkit.server :only [run-server]] - [clj-stacktrace.core :only [parse-exception]]) + [clj-stacktrace.core :only [parse-exception]] + [clojure.java.io :only [writer]]) (:import java.lang.management.ManagementFactory)) +(defonce server (atom nil)) + (def object-pattern (delay (or (env :mbeanz-object-pattern) "*:*"))) (def jmx-remote-host (delay (or (env :mbeanz-jmx-remote-host) "localhost"))) @@ -62,4 +65,6 @@ (wrap-defaults api-defaults))) (defn -main [& args] - (run-server app {:port 7999})) + (reset! server (run-server app {:port 0})) + (with-open [my-writer (writer "/var/tmp/mbeanz.port")] + (.write my-writer (str (:local-port (meta @server))))))