diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2c0b591 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +priv/*.jar +priv/*.so diff --git a/cljnode/.gitignore b/cljnode/.gitignore new file mode 100644 index 0000000..e04714b --- /dev/null +++ b/cljnode/.gitignore @@ -0,0 +1,9 @@ +/target +/classes +/checkouts +pom.xml +pom.xml.asc +*.jar +*.class +/.lein-* +/.nrepl-port diff --git a/cljnode/LICENSE b/cljnode/LICENSE new file mode 100644 index 0000000..786edf6 --- /dev/null +++ b/cljnode/LICENSE @@ -0,0 +1,214 @@ +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and +documentation distributed under this Agreement, and + +b) in the case of each subsequent Contributor: + +i) changes to the Program, and + +ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from +a Contributor if it was added to the Program by such Contributor itself or +anyone acting on such Contributor's behalf. Contributions do not include +additions to the Program which: (i) are separate modules of software +distributed in conjunction with the Program under their own license +agreement, and (ii) are not derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and +such derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under +Licensed Patents to make, use, sell, offer to sell, import and otherwise +transfer the Contribution of such Contributor, if any, in source code and +object code form. This patent license shall apply to the combination of the +Contribution and the Program if, at the time the Contribution is added by the +Contributor, such addition of the Contribution causes such combination to be +covered by the Licensed Patents. The patent license shall not apply to any +other combinations which include the Contribution. No hardware per se is +licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses +to its Contributions set forth herein, no assurances are provided by any +Contributor that the Program does not infringe the patent or other +intellectual property rights of any other entity. Each Contributor disclaims +any liability to Recipient for claims brought by any other entity based on +infringement of intellectual property rights or otherwise. As a condition to +exercising the rights and licenses granted hereunder, each Recipient hereby +assumes sole responsibility to secure any other intellectual property rights +needed, if any. For example, if a third party patent license is required to +allow Recipient to distribute the Program, it is Recipient's responsibility +to acquire that license before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient +copyright rights in its Contribution, if any, to grant the copyright license +set forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under +its own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title +and non-infringement, and implied warranties or conditions of merchantability +and fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered +by that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such +Contributor, and informs licensees how to obtain it in a reasonable manner on +or through a medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within +the Program. + +Each Contributor must identify itself as the originator of its Contribution, +if any, in a manner that reasonably allows subsequent Recipients to identify +the originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a +manner which does not create potential liability for other Contributors. +Therefore, if a Contributor includes the Program in a commercial product +offering, such Contributor ("Commercial Contributor") hereby agrees to defend +and indemnify every other Contributor ("Indemnified Contributor") against any +losses, damages and costs (collectively "Losses") arising from claims, +lawsuits and other legal actions brought by a third party against the +Indemnified Contributor to the extent caused by the acts or omissions of such +Commercial Contributor in connection with its distribution of the Program in +a commercial product offering. The obligations in this section do not apply +to any claims or Losses relating to any actual or alleged intellectual +property infringement. In order to qualify, an Indemnified Contributor must: +a) promptly notify the Commercial Contributor in writing of such claim, and +b) allow the Commercial Contributor tocontrol, and cooperate with the +Commercial Contributor in, the defense and any related settlement +negotiations. The Indemnified Contributor may participate in any such claim +at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If +that Commercial Contributor then makes performance claims, or offers +warranties related to Product X, those performance claims and warranties are +such Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a +court requires any other Contributor to pay any damages as a result, the +Commercial Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON +AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER +EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR +CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A +PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the +appropriateness of using and distributing the Program and assumes all risks +associated with its exercise of rights under this Agreement , including but +not limited to the risks and costs of program errors, compliance with +applicable laws, damage to or loss of data, programs or equipment, and +unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION +LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of the +remainder of the terms of this Agreement, and without further action by the +parties hereto, such provision shall be reformed to the minimum extent +necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Program itself +(excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted +under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and +does not cure such failure in a reasonable period of time after becoming +aware of such noncompliance. If all Recipient's rights under this Agreement +terminate, Recipient agrees to cease use and distribution of the Program as +soon as reasonably practicable. However, Recipient's obligations under this +Agreement and any licenses granted by Recipient relating to the Program shall +continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to +time. No one other than the Agreement Steward has the right to modify this +Agreement. The Eclipse Foundation is the initial Agreement Steward. The +Eclipse Foundation may assign the responsibility to serve as the Agreement +Steward to a suitable separate entity. Each new version of the Agreement will +be given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the +Agreement under which it was received. In addition, after a new version of +the Agreement is published, Contributor may elect to distribute the Program +(including its Contributions) under the new version. Except as expressly +stated in Sections 2(a) and 2(b) above, Recipient receives no rights or +licenses to the intellectual property of any Contributor under this +Agreement, whether expressly, by implication, estoppel or otherwise. All +rights in the Program not expressly granted under this Agreement are +reserved. + +This Agreement is governed by the laws of the State of Washington and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial +in any resulting litigation. diff --git a/cljnode/Makefile b/cljnode/Makefile new file mode 100644 index 0000000..1239b2c --- /dev/null +++ b/cljnode/Makefile @@ -0,0 +1,2 @@ +all: + @lein uberjar diff --git a/cljnode/README.md b/cljnode/README.md new file mode 100644 index 0000000..4b208c5 --- /dev/null +++ b/cljnode/README.md @@ -0,0 +1,36 @@ +# cljnode + +FIXME: description + +## Installation + +Download from http://example.com/FIXME. + +## Usage + +FIXME: explanation + + $ java -jar cljnode-0.1.0-standalone.jar [args] + +## Options + +FIXME: listing of options this app accepts. + +## Examples + +... + +### Bugs + +... + +### Any Other Sections +### That You Think +### Might be Useful + +## License + +Copyright © 2013 FIXME + +Distributed under the Eclipse Public License either version 1.0 or (at +your option) any later version. diff --git a/cljnode/doc/intro.md b/cljnode/doc/intro.md new file mode 100644 index 0000000..b609316 --- /dev/null +++ b/cljnode/doc/intro.md @@ -0,0 +1,3 @@ +# Introduction to cljnode + +TODO: write [great documentation](http://jacobian.org/writing/great-documentation/what-to-write/) diff --git a/cljnode/log/logger1.log b/cljnode/log/logger1.log new file mode 100644 index 0000000..7fee943 --- /dev/null +++ b/cljnode/log/logger1.log @@ -0,0 +1,8 @@ +2013-12-08 15:23:37,842 INFO [main] start +2013-12-08 15:23:37,843 INFO [main] started with params: + nodename: clj_node@ewm + mbox: clj_mbox + cookie: IWTCJHGBARFWYBQLHMKI + epmd_port: 15000 +2013-12-08 15:23:38,386 INFO [main] linked with erlang #Pid +2013-12-08 15:23:38,387 INFO [main] erlang node checked diff --git a/cljnode/project.clj b/cljnode/project.clj new file mode 100644 index 0000000..96f9f74 --- /dev/null +++ b/cljnode/project.clj @@ -0,0 +1,19 @@ +(defproject cljnode "0.1.0" + :jvm-opts ["-Ddev_env=dev" "-Dnode=cljnode@127.0.0.1" "-Dmbox=mboxname" + "-Dcookie=cookie" "-Depmd_port=15000"] + :description "clojure + erlang" + :url "http://vonmo.com/projects/cljnode" + :license {:name "Eclipse Public License" + :url "http://www.eclipse.org/legal/epl-v10.html"} + :resource-paths [ ] + :dependencies [ [org.clojure/clojure "1.5.1"] + [org.clojure/tools.logging "0.2.4"] + [org.slf4j/slf4j-log4j12 "1.7.1"] + [log4j/log4j "1.2.17" :exclusions [javax.mail/mail + javax.jms/jms + com.sun.jmdk/jmxtools + com.sun.jmx/jmxri]] + [com.ericsson.otp.erlang/otperlang "1.5.3"]] + :main ^:skip-aot cljnode.core + :target-path "target/%s" + :profiles {:uberjar {:aot :all}}) diff --git a/cljnode/src/cljnode/core.clj b/cljnode/src/cljnode/core.clj new file mode 100644 index 0000000..73805dc --- /dev/null +++ b/cljnode/src/cljnode/core.clj @@ -0,0 +1,22 @@ +(ns + cljnode.core + #^{:author "Maxim Molchanov ", + :doc "Node run point"} + (:require [clojure.tools.logging :as log] + [cljnode.server :as srv]) + (:import [com.ericsson.otp.erlang + OtpErlangAtom + OtpErlangTuple + OtpErlangObject + OtpNode]) + (:gen-class)) + +(defn -main + [& args] + (log/info "start") + (srv/server + (System/getProperty "node") + (System/getProperty "mbox") + (System/getProperty "cookie") + (read-string (System/getProperty "epmd_port"))) + (log/info "stop")) diff --git a/cljnode/src/cljnode/proto_handler.clj b/cljnode/src/cljnode/proto_handler.clj new file mode 100644 index 0000000..b2b13a5 --- /dev/null +++ b/cljnode/src/cljnode/proto_handler.clj @@ -0,0 +1,33 @@ +(ns + cljnode.proto_handler + #^{:author "Maxim Molchanov ", + :doc "Protocol handler class"} + (:require [clojure.tools.logging :as log]) + (:import [com.ericsson.otp.erlang + OtpErlangAtom + OtpErlangTuple + OtpErlangObject + OtpNode]) + (:gen-class)) + +(defn handle_ping + [msg mbox] + (log/info (format "handle %s" msg)) + (.send mbox (.elementAt ^OtpErlangTuple msg 1) + (new OtpErlangTuple + (into-array OtpErlangObject [(new OtpErlangAtom "pong") (.self mbox)])))) + +(defn linkToErl + [dpid mbox] + (.link mbox dpid) + (log/info (format "linked with erlang %s" dpid))) + +(defn checkErlNode + [mbox timeout] + (def msgObj (.receive mbox timeout)) + (def cmd (.elementAt msgObj 0)) + (def dpid (.elementAt msgObj 1)) + (if (= (.atomValue cmd) "ping") + (linkToErl dpid mbox) + (new Exception "First message should be ping")) + (log/info "erlang node checked")) diff --git a/cljnode/src/cljnode/server.clj b/cljnode/src/cljnode/server.clj new file mode 100644 index 0000000..88e8570 --- /dev/null +++ b/cljnode/src/cljnode/server.clj @@ -0,0 +1,35 @@ +(ns + cljnode.server + #^{:author "Maxim Molchanov ", + :doc "Main server class"} + (:require [clojure.tools.logging :as log] + [cljnode.proto_handler :as proto]) + (:import [com.ericsson.otp.erlang + OtpErlangAtom + OtpErlangTuple + OtpErlangObject + OtpNode]) + (:gen-class)) + +(defn process + [msg mbox] + (def cmd (.elementAt ^OtpErlangTuple msg 0)) + (cond + (= (.atomValue cmd) "ping") (proto/handle_ping msg mbox) + :else (log/error (format "undefined msg: %s" (str msg))))) + +(defn handleErlMessages + [mbox] + (try (def msg (.receive mbox 50)) + (if (instance? OtpErlangTuple msg) (process msg mbox) ()) + (handleErlMessages mbox) + (catch Exception e (log/error (format (str e)))))) + +(defn server + [NodeName Mbox Cookie Port] + (log/info (format "started with params:\n\tnodename: %s\n\tmbox: %s\n\tcookie: %s\n\tepmd_port: %s" + NodeName Mbox Cookie Port)) + (def mbox (.createMbox (new OtpNode NodeName Cookie Port) Mbox)) + (proto/checkErlNode mbox 10000) + (handleErlMessages mbox) + (log/info "destroy server")) diff --git a/cljnode/src/log4j.properties b/cljnode/src/log4j.properties new file mode 100644 index 0000000..ad3cc88 --- /dev/null +++ b/cljnode/src/log4j.properties @@ -0,0 +1,14 @@ +#log4j.rootLogger=DEBUG, stdout, R +log4j.rootLogger=DEBUG, R + +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %m%n + +log4j.appender.R=org.apache.log4j.RollingFileAppender +log4j.appender.R.layout=org.apache.log4j.PatternLayout +log4j.appender.R.File=/tmp/clj_log.log +log4j.appender.R.MaxFileSize=100KB +log4j.appender.R.MaxBackupIndex=20 +log4j.appender.R.Append=false +log4j.appender.R.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %m%n diff --git a/cljnode/test/cljnode/core_test.clj b/cljnode/test/cljnode/core_test.clj new file mode 100644 index 0000000..bb81398 --- /dev/null +++ b/cljnode/test/cljnode/core_test.clj @@ -0,0 +1,7 @@ +(ns cljnode.core-test + (:require [clojure.test :refer :all] + [cljnode.core :refer :all])) + +(deftest a-test + (testing "FIXME, I fail." + (is (= 0 1)))) diff --git a/priv/.empty b/priv/.empty new file mode 100644 index 0000000..e69de29 diff --git a/rebar.config b/rebar.config new file mode 100644 index 0000000..a8db3f1 --- /dev/null +++ b/rebar.config @@ -0,0 +1,5 @@ +{pre_hooks, [ + {compile, "make -C cljnode --no-print-directory"}, + {compile, "mv cljnode/target/*.jar priv/"} + ] +}. diff --git a/src/clj_controller.erl b/src/clj_controller.erl new file mode 100644 index 0000000..80793b0 --- /dev/null +++ b/src/clj_controller.erl @@ -0,0 +1,207 @@ +-module(clj_controller). + +-behaviour(gen_server). + +-include_lib("common/include/log.hrl"). +-include_lib("eunit/include/eunit.hrl"). + +%% API +-export([start_link/0]). + +%% gen_server callbacks +-export([init/1, handle_call/3, handle_cast/2, handle_info/2, + terminate/2, code_change/3]). + +%% Only for tests +-export([stop/1]). + +-define(SERVER, ?MODULE). +-define(PING_INTERVAL, 1000). + +-record(state, { remote_pid = undefined :: pid(), + waiters = [] :: list(), + ext_port_ref = undefined :: reference() }). + +%%%=================================================================== +%%% API +%%%=================================================================== + +%%-------------------------------------------------------------------- +%% @doc +%% Starts the server +%% +%% @spec start_link() -> {ok, Pid} | ignore | {error, Error} +%% @end +%%-------------------------------------------------------------------- +start_link() -> + gen_server:start_link({local, ?SERVER}, ?MODULE, [], []). + +%%%=================================================================== +%%% gen_server callbacks +%%%=================================================================== + +%%-------------------------------------------------------------------- +%% @private +%% @doc +%% Initializes the server +%% +%% @spec init(Args) -> {ok, State} | +%% {ok, State, Timeout} | +%% ignore | +%% {stop, Reason} +%% @end +%%-------------------------------------------------------------------- +init([]) -> + Port = start_app(), + gen_server:cast(self(), ping), + {ok, #state{ext_port_ref = Port}}. + +%% only for test +stop(Reason)-> + gen_server:cast(?SERVER, {stop_test, Reason}). + +%%-------------------------------------------------------------------- +%% @private +%% @doc +%% Handling call messages +%% +%% @spec handle_call(Request, From, State) -> +%% {reply, Reply, State} | +%% {reply, Reply, State, Timeout} | +%% {noreply, State} | +%% {noreply, State, Timeout} | +%% {stop, Reason, Reply, State} | +%% {stop, Reason, State} +%% @end +%%-------------------------------------------------------------------- +handle_call(_Request, _From, State) -> + Reply = ok, + {reply, Reply, State}. + +%%-------------------------------------------------------------------- +%% @private +%% @doc +%% Handling cast messages +%% +%% @spec handle_cast(Msg, State) -> {noreply, State} | +%% {noreply, State, Timeout} | +%% {stop, Reason, State} +%% @end +%%-------------------------------------------------------------------- + +handle_cast({stop_test, Reason}, State)-> + {stop, Reason, State}; + +handle_cast(ping, State) -> + {ok, Node} = application:get_env(clojurenode, node), + {ok, Mbox} = application:get_env(clojurenode, mbox), + {ok, Host} = case application:get_env(clojurenode, host) of + undefined -> + inet:gethostname(); + Other -> + Other + end, + ping(Host, Node, Mbox), + erlang:send_after(?PING_INTERVAL, self(), ping), + {noreply, State}; + +handle_cast(_Msg, State) -> + ?ERR("unhandled cast, ~p", [_Msg]), + {noreply, State}. + +%%-------------------------------------------------------------------- +%% @private +%% @doc +%% Handling all non call/cast messages +%% +%% @spec handle_info(Info, State) -> {noreply, State} | +%% {noreply, State, Timeout} | +%% {stop, Reason, State} +%% @end +%%-------------------------------------------------------------------- +handle_info(ping, #state {remote_pid = undefined} = State) -> + gen_server:cast(self(), ping), + {noreply, State}; + +handle_info(ping, State) -> + {noreply, State}; + +handle_info({pong, Pid}, #state {remote_pid = undefined, + waiters = Waiters} = State) -> + ?LOG("connection to java node established, pid ~p", [Pid]), + link(Pid), + lists:foreach(fun(Waiter) -> + gen_server:cast(self(), {wait_for_login, Waiter}) + end, Waiters), + {noreply, State#state {waiters = [], + remote_pid = Pid}}; + +handle_info({pong, _}, State) -> + {noreply, State}; + +handle_info({Port, {exit_status, Status}}, #state {ext_port_ref = Port} = State) -> + ?ERR("external java app exited with status ~p", [Status]), + {stop, {error, {java_app_exit, Status}}, State}; + +handle_info({'EXIT', Pid, Reason}, #state {remote_pid = Pid} = State) -> + ?ERR("external java mbox exited with reason ~p", [Reason]), + {stop, {error, {java_mbox_exit, Reason}}, State}; + +handle_info(_Info, State) -> + ?ERR("unhandled info, ~p", [_Info]), + {noreply, State}. + +%%-------------------------------------------------------------------- +%% @private +%% @doc +%% This function is called by a gen_server when it is about to +%% terminate. It should be the opposite of Module:init/1 and do any +%% necessary cleaning up. When it returns, the gen_server terminates +%% with Reason. The return value is ignored. +%% +%% @spec terminate(Reason, State) -> void() +%% @end +%%-------------------------------------------------------------------- +terminate(_Reason, _State) -> + ok. + +%%-------------------------------------------------------------------- +%% @private +%% @doc +%% Convert process state when code is changed +%% +%% @spec code_change(OldVsn, State, Extra) -> {ok, NewState} +%% @end +%%-------------------------------------------------------------------- +code_change(_OldVsn, State, _Extra) -> + {ok, State}. + +%%%=================================================================== +%%% Internal functions +%%%=================================================================== + +start_app() -> + {ok, NodeCfg} = application:get_env(clojurenode, node), + {ok, HostName} = inet:gethostname(), + Node = full_node_name(HostName, NodeCfg), + {ok, Mbox} = application:get_env(clojurenode, mbox), + {ok, Cmd} = application:get_env(clojurenode, cmd), + {ok, Port} = application:get_env(clojurenode, epmd_port), + PrivDir = code:priv_dir(clojurenode), + %% If config file is the relative path then append priv directory + LogFileName = atom_to_list(node()) ++ "_clj.log", + CmdWithParams = "java "++ + "-Dnode=\""++atom_to_list(Node) ++ "\" " ++ + "-Dmbox=\""++atom_to_list(Mbox) ++ "\" " ++ + "-Dcookie=\""++atom_to_list(erlang:get_cookie()) ++ "\" " ++ + "-Depmd_port="++lists:flatten(io_lib:format("~p", [Port])) ++ " " ++ + "-Dlogfile=\""++PrivDir ++ "/" ++ LogFileName++"\" " ++ + "-classpath " ++ PrivDir ++ "/" ++ Cmd ++ " ", + ?LOG("starting clojure app with cmd ~p", [CmdWithParams]), + open_port({spawn, CmdWithParams}, [exit_status]). + +ping(Host, Node, Mbox) -> + erlang:send({Mbox, full_node_name(Host, Node)}, {ping, self()}). + +full_node_name(Host, Node) -> + list_to_atom(atom_to_list(Node) ++ "@" ++ Host). diff --git a/src/clojurenode.app.src b/src/clojurenode.app.src new file mode 100644 index 0000000..d8bf7b3 --- /dev/null +++ b/src/clojurenode.app.src @@ -0,0 +1,17 @@ +{application, clojurenode, + [ + {description, ""}, + {vsn, "1"}, + {registered, []}, + {applications, [ + kernel, + stdlib + ]}, + {mod, { clojurenode_app, []}}, + {env, [ + {cmd, "cljnode-0.1.0-standalone.jar cljnode.core"}, + {node, clj_node}, + {mbox, clj_mbox}, + {epmd_port, 15000} + ]} + ]}. diff --git a/src/clojurenode_app.erl b/src/clojurenode_app.erl new file mode 100644 index 0000000..1ade6d0 --- /dev/null +++ b/src/clojurenode_app.erl @@ -0,0 +1,16 @@ +-module(clojurenode_app). + +-behaviour(application). + +%% Application callbacks +-export([start/2, stop/1]). + +%% =================================================================== +%% Application callbacks +%% =================================================================== + +start(_StartType, _StartArgs) -> + clojurenode_sup:start_link(). + +stop(_State) -> + ok. diff --git a/src/clojurenode_sup.erl b/src/clojurenode_sup.erl new file mode 100644 index 0000000..59a0adf --- /dev/null +++ b/src/clojurenode_sup.erl @@ -0,0 +1,28 @@ + +-module(clojurenode_sup). + +-behaviour(supervisor). + +%% API +-export([start_link/0]). + +%% Supervisor callbacks +-export([init/1]). + +%% Helper macro for declaring children of supervisor +-define(CHILD(I, Type), {I, {I, start_link, []}, permanent, 5000, Type, [I]}). + +%% =================================================================== +%% API functions +%% =================================================================== + +start_link() -> + supervisor:start_link({local, ?MODULE}, ?MODULE, []). + +%% =================================================================== +%% Supervisor callbacks +%% =================================================================== + +init([]) -> + {ok, { {one_for_one, 5, 10}, [?CHILD(clj_controller, worker)]} }. + diff --git a/test/start_stop_tests.erl b/test/start_stop_tests.erl new file mode 100755 index 0000000..e84bc41 --- /dev/null +++ b/test/start_stop_tests.erl @@ -0,0 +1,49 @@ +-module(start_stop_tests). + +-include_lib("eunit/include/eunit.hrl"). +-include_lib("common/include/test.hrl"). + +-define(APPS, [ sasl ]). + +%% ============================================================================= +%% Common +%% ============================================================================= +setup()-> + error_logger:tty(false), + tools:make_distrib("test_node", shortnames), + ?START_APPS( + ?APPS, [ + {sasl, [ {sasl_error_logger, {file, "test.log"}} ]} + ] + ), + ok. + +cleanup(_)-> + ?STOP_APPS(?APPS), + tools:stop_distrib(), + error_logger:tty(true), + ok. + +%% ============================================================================= +%% Tests +%% ============================================================================= +main_test_() -> + ?FIXTURE( + fun()-> + ?assertEqual(ok, application:load(clojurenode)), + ?assertEqual(ok, application:start(clojurenode)), + %% wait for java start + timer:sleep(3000), + ?assertEqual( + {error,{already_started, clojurenode}}, + application:start(clojurenode) + ), + ?assertEqual(ok, application:stop(clojurenode)), + ?assertEqual(ok, application:unload(clojurenode)), + ok + end + ). + +%% ============================================================================= +%% Helpers +%% =============================================================================