From 378a30e112f18aaf34b7561de99edf558deb7898 Mon Sep 17 00:00:00 2001 From: Craig Everett Date: Sat, 26 Sep 2020 12:58:17 +0900 Subject: [PATCH] dding service -> worker template --- zomp/etc/version.txt | 2 +- zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/Emakefile | 0 zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/LICENSE | 0 .../otpr/zx/{0.11.6 => 0.11.7}/ebin/zx.app | 2 +- .../{0.11.6 => 0.11.7}/include/zx_logger.hrl | 0 .../otpr/zx/{0.11.6 => 0.11.7}/launcher.png | Bin zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/make_zx | 0 .../lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx.erl | 2 +- .../zx/{0.11.6 => 0.11.7}/src/zx_auth.erl | 2 +- .../zx/{0.11.6 => 0.11.7}/src/zx_conn.erl | 2 +- .../zx/{0.11.6 => 0.11.7}/src/zx_conn_sup.erl | 2 +- .../zx/{0.11.6 => 0.11.7}/src/zx_daemon.erl | 2 +- .../otpr/zx/{0.11.6 => 0.11.7}/src/zx_key.erl | 2 +- .../otpr/zx/{0.11.6 => 0.11.7}/src/zx_lib.erl | 2 +- .../zx/{0.11.6 => 0.11.7}/src/zx_local.erl | 2 +- .../otpr/zx/{0.11.6 => 0.11.7}/src/zx_net.erl | 2 +- .../zx/{0.11.6 => 0.11.7}/src/zx_peer.erl | 2 +- .../zx/{0.11.6 => 0.11.7}/src/zx_peer_man.erl | 2 +- .../zx/{0.11.6 => 0.11.7}/src/zx_peer_sup.erl | 2 +- .../zx/{0.11.6 => 0.11.7}/src/zx_peers.erl | 2 +- .../zx/{0.11.6 => 0.11.7}/src/zx_proxy.erl | 2 +- .../otpr/zx/{0.11.6 => 0.11.7}/src/zx_sup.erl | 2 +- .../otpr/zx/{0.11.6 => 0.11.7}/src/zx_tty.erl | 2 +- .../zx/{0.11.6 => 0.11.7}/src/zx_userconf.erl | 2 +- .../otpr/zx/{0.11.6 => 0.11.7}/src/zx_zsp.erl | 2 +- .../zx/{0.11.6 => 0.11.7}/templates/Emakefile | 0 .../templates/boringlib/funfile.erl | 0 .../zx/{0.11.6 => 0.11.7}/templates/escript | 0 .../templates/example_server/appmod.erl | 0 .../templates/example_server/src/_client.erl | 0 .../example_server/src/_client_man.erl | 2 +- .../example_server/src/_client_sup.erl | 6 +- .../templates/example_server/src/_clients.erl | 12 +- .../templates/example_server/src/_sup.erl | 0 .../zx/{0.11.6 => 0.11.7}/templates/gitignore | 0 .../templates/hellowx/appmod.erl | 0 .../templates/hellowx/src/_con.erl | 0 .../templates/hellowx/src/_gui.erl | 0 .../templates/hellowx/src/_sup.erl | 0 .../templates/licenses/apache2.txt | 0 .../templates/licenses/bsd2.txt | 0 .../templates/licenses/bsd3.txt | 0 .../templates/licenses/cc0.txt | 0 .../templates/licenses/gpl3.txt | 0 .../templates/licenses/lgpl3.txt | 0 .../templates/licenses/mit.txt | 0 .../templates/licenses/mpl2.txt | 0 .../templates/service_worker/worker.erl | 73 +++++++++++ .../templates/service_worker/worker_man.erl | 119 ++++++++++++++++++ .../templates/service_worker/worker_sup.erl | 49 ++++++++ .../templates/service_worker/workers.erl | 50 ++++++++ .../templates/simplecli.erl | 0 zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/zomp.meta | 2 +- 53 files changed, 322 insertions(+), 31 deletions(-) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/Emakefile (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/LICENSE (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/ebin/zx.app (95%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/include/zx_logger.hrl (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/launcher.png (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/make_zx (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx_auth.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx_conn.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx_conn_sup.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx_daemon.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx_key.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx_lib.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx_local.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx_net.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx_peer.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx_peer_man.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx_peer_sup.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx_peers.erl (98%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx_proxy.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx_sup.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx_tty.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx_userconf.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/src/zx_zsp.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/Emakefile (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/boringlib/funfile.erl (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/escript (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/example_server/appmod.erl (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/example_server/src/_client.erl (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/example_server/src/_client_man.erl (99%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/example_server/src/_client_sup.erl (92%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/example_server/src/_clients.erl (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/example_server/src/_sup.erl (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/gitignore (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/hellowx/appmod.erl (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/hellowx/src/_con.erl (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/hellowx/src/_gui.erl (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/hellowx/src/_sup.erl (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/licenses/apache2.txt (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/licenses/bsd2.txt (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/licenses/bsd3.txt (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/licenses/cc0.txt (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/licenses/gpl3.txt (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/licenses/lgpl3.txt (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/licenses/mit.txt (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/licenses/mpl2.txt (100%) create mode 100644 zomp/lib/otpr/zx/0.11.7/templates/service_worker/worker.erl create mode 100644 zomp/lib/otpr/zx/0.11.7/templates/service_worker/worker_man.erl create mode 100644 zomp/lib/otpr/zx/0.11.7/templates/service_worker/worker_sup.erl create mode 100644 zomp/lib/otpr/zx/0.11.7/templates/service_worker/workers.erl rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/templates/simplecli.erl (100%) rename zomp/lib/otpr/zx/{0.11.6 => 0.11.7}/zomp.meta (91%) diff --git a/zomp/etc/version.txt b/zomp/etc/version.txt index e5cbde3..b80f98e 100644 --- a/zomp/etc/version.txt +++ b/zomp/etc/version.txt @@ -1 +1 @@ -0.11.6 +0.11.7 diff --git a/zomp/lib/otpr/zx/0.11.6/Emakefile b/zomp/lib/otpr/zx/0.11.7/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/Emakefile rename to zomp/lib/otpr/zx/0.11.7/Emakefile diff --git a/zomp/lib/otpr/zx/0.11.6/LICENSE b/zomp/lib/otpr/zx/0.11.7/LICENSE similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/LICENSE rename to zomp/lib/otpr/zx/0.11.7/LICENSE diff --git a/zomp/lib/otpr/zx/0.11.6/ebin/zx.app b/zomp/lib/otpr/zx/0.11.7/ebin/zx.app similarity index 95% rename from zomp/lib/otpr/zx/0.11.6/ebin/zx.app rename to zomp/lib/otpr/zx/0.11.7/ebin/zx.app index fc95c27..451dc16 100644 --- a/zomp/lib/otpr/zx/0.11.6/ebin/zx.app +++ b/zomp/lib/otpr/zx/0.11.7/ebin/zx.app @@ -1,6 +1,6 @@ {application,zx, [{description,"An Erlang development tool and Zomp user client"}, - {vsn,"0.11.6"}, + {vsn,"0.11.7"}, {applications,[stdlib,kernel]}, {modules,[zx,zx_auth,zx_conn,zx_conn_sup,zx_daemon,zx_key, zx_lib,zx_local,zx_net,zx_peer,zx_peer_man, diff --git a/zomp/lib/otpr/zx/0.11.6/include/zx_logger.hrl b/zomp/lib/otpr/zx/0.11.7/include/zx_logger.hrl similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/include/zx_logger.hrl rename to zomp/lib/otpr/zx/0.11.7/include/zx_logger.hrl diff --git a/zomp/lib/otpr/zx/0.11.6/launcher.png b/zomp/lib/otpr/zx/0.11.7/launcher.png similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/launcher.png rename to zomp/lib/otpr/zx/0.11.7/launcher.png diff --git a/zomp/lib/otpr/zx/0.11.6/make_zx b/zomp/lib/otpr/zx/0.11.7/make_zx similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/make_zx rename to zomp/lib/otpr/zx/0.11.7/make_zx diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx.erl b/zomp/lib/otpr/zx/0.11.7/src/zx.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/src/zx.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx.erl index 60f7ae8..2e20604 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx.erl @@ -24,7 +24,7 @@ %%% @end -module(zx). --vsn("0.11.6"). +-vsn("0.11.7"). -behavior(application). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx_auth.erl b/zomp/lib/otpr/zx/0.11.7/src/zx_auth.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/src/zx_auth.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx_auth.erl index a16bad1..05835e0 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx_auth.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx_auth.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_auth). --vsn("0.11.6"). +-vsn("0.11.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx_conn.erl b/zomp/lib/otpr/zx/0.11.7/src/zx_conn.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/src/zx_conn.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx_conn.erl index ceb31bd..fbb1170 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx_conn.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx_conn.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_conn). --vsn("0.11.6"). +-vsn("0.11.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx_conn_sup.erl b/zomp/lib/otpr/zx/0.11.7/src/zx_conn_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/src/zx_conn_sup.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx_conn_sup.erl index 8cac64f..e14209a 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx_conn_sup.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx_conn_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_conn_sup). --vsn("0.11.6"). +-vsn("0.11.7"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx_daemon.erl b/zomp/lib/otpr/zx/0.11.7/src/zx_daemon.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/src/zx_daemon.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx_daemon.erl index 9f475ce..448c6b6 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx_daemon.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx_daemon.erl @@ -138,7 +138,7 @@ %%% @end -module(zx_daemon). --vsn("0.11.6"). +-vsn("0.11.7"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx_key.erl b/zomp/lib/otpr/zx/0.11.7/src/zx_key.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/src/zx_key.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx_key.erl index 27234e8..4d7dad6 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx_key.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx_key.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_key). --vsn("0.11.6"). +-vsn("0.11.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx_lib.erl b/zomp/lib/otpr/zx/0.11.7/src/zx_lib.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/src/zx_lib.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx_lib.erl index 9b5250f..2f2f9c1 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx_lib.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx_lib.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_lib). --vsn("0.11.6"). +-vsn("0.11.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx_local.erl b/zomp/lib/otpr/zx/0.11.7/src/zx_local.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/src/zx_local.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx_local.erl index c082d4f..c56453d 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx_local.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx_local.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_local). --vsn("0.11.6"). +-vsn("0.11.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx_net.erl b/zomp/lib/otpr/zx/0.11.7/src/zx_net.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/src/zx_net.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx_net.erl index 2f3824f..2d0f1bf 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx_net.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx_net.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_net). --vsn("0.11.6"). +-vsn("0.11.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx_peer.erl b/zomp/lib/otpr/zx/0.11.7/src/zx_peer.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/src/zx_peer.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx_peer.erl index 5518fba..13545b1 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx_peer.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx_peer.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_peer). --vsn("0.11.6"). +-vsn("0.11.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx_peer_man.erl b/zomp/lib/otpr/zx/0.11.7/src/zx_peer_man.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/src/zx_peer_man.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx_peer_man.erl index cdf5407..85fbc9d 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx_peer_man.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx_peer_man.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_peer_man). --vsn("0.11.6"). +-vsn("0.11.7"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx_peer_sup.erl b/zomp/lib/otpr/zx/0.11.7/src/zx_peer_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/src/zx_peer_sup.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx_peer_sup.erl index 2b159a8..b997cc8 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx_peer_sup.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx_peer_sup.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_peer_sup). --vsn("0.11.6"). +-vsn("0.11.7"). -behaviour(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx_peers.erl b/zomp/lib/otpr/zx/0.11.7/src/zx_peers.erl similarity index 98% rename from zomp/lib/otpr/zx/0.11.6/src/zx_peers.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx_peers.erl index 4b2c3b2..2e46e30 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx_peers.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx_peers.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_peers). --vsn("0.11.6"). +-vsn("0.11.7"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx_proxy.erl b/zomp/lib/otpr/zx/0.11.7/src/zx_proxy.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/src/zx_proxy.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx_proxy.erl index e8be456..5481a5c 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx_proxy.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx_proxy.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_proxy). --vsn("0.11.6"). +-vsn("0.11.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx_sup.erl b/zomp/lib/otpr/zx/0.11.7/src/zx_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/src/zx_sup.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx_sup.erl index 74085f9..1ad16cb 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx_sup.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_sup). --vsn("0.11.6"). +-vsn("0.11.7"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx_tty.erl b/zomp/lib/otpr/zx/0.11.7/src/zx_tty.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/src/zx_tty.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx_tty.erl index 2ae57cc..af4b4d9 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx_tty.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx_tty.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_tty). --vsn("0.11.6"). +-vsn("0.11.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx_userconf.erl b/zomp/lib/otpr/zx/0.11.7/src/zx_userconf.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/src/zx_userconf.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx_userconf.erl index 8bd4ec7..704cc38 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx_userconf.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx_userconf.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_userconf). --vsn("0.11.6"). +-vsn("0.11.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.11.6/src/zx_zsp.erl b/zomp/lib/otpr/zx/0.11.7/src/zx_zsp.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/src/zx_zsp.erl rename to zomp/lib/otpr/zx/0.11.7/src/zx_zsp.erl index eda06e3..8ef4330 100644 --- a/zomp/lib/otpr/zx/0.11.6/src/zx_zsp.erl +++ b/zomp/lib/otpr/zx/0.11.7/src/zx_zsp.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_zsp). --vsn("0.11.6"). +-vsn("0.11.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.11.6/templates/Emakefile b/zomp/lib/otpr/zx/0.11.7/templates/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/Emakefile rename to zomp/lib/otpr/zx/0.11.7/templates/Emakefile diff --git a/zomp/lib/otpr/zx/0.11.6/templates/boringlib/funfile.erl b/zomp/lib/otpr/zx/0.11.7/templates/boringlib/funfile.erl similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/boringlib/funfile.erl rename to zomp/lib/otpr/zx/0.11.7/templates/boringlib/funfile.erl diff --git a/zomp/lib/otpr/zx/0.11.6/templates/escript b/zomp/lib/otpr/zx/0.11.7/templates/escript similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/escript rename to zomp/lib/otpr/zx/0.11.7/templates/escript diff --git a/zomp/lib/otpr/zx/0.11.6/templates/example_server/appmod.erl b/zomp/lib/otpr/zx/0.11.7/templates/example_server/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/example_server/appmod.erl rename to zomp/lib/otpr/zx/0.11.7/templates/example_server/appmod.erl diff --git a/zomp/lib/otpr/zx/0.11.6/templates/example_server/src/_client.erl b/zomp/lib/otpr/zx/0.11.7/templates/example_server/src/_client.erl similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/example_server/src/_client.erl rename to zomp/lib/otpr/zx/0.11.7/templates/example_server/src/_client.erl diff --git a/zomp/lib/otpr/zx/0.11.6/templates/example_server/src/_client_man.erl b/zomp/lib/otpr/zx/0.11.7/templates/example_server/src/_client_man.erl similarity index 99% rename from zomp/lib/otpr/zx/0.11.6/templates/example_server/src/_client_man.erl rename to zomp/lib/otpr/zx/0.11.7/templates/example_server/src/_client_man.erl index f9589c1..587eab7 100644 --- a/zomp/lib/otpr/zx/0.11.6/templates/example_server/src/_client_man.erl +++ b/zomp/lib/otpr/zx/0.11.7/templates/example_server/src/_client_man.erl @@ -243,7 +243,7 @@ do_ignore(State = #s{listener = none}) -> State; do_ignore(State = #s{listener = Listener}) -> ok = gen_tcp:close(Listener), - State#s{listener = none}. + State#s{port_num = none, listener = none}. -spec do_enroll(Pid, State) -> NewState diff --git a/zomp/lib/otpr/zx/0.11.6/templates/example_server/src/_client_sup.erl b/zomp/lib/otpr/zx/0.11.7/templates/example_server/src/_client_sup.erl similarity index 92% rename from zomp/lib/otpr/zx/0.11.6/templates/example_server/src/_client_sup.erl rename to zomp/lib/otpr/zx/0.11.7/templates/example_server/src/_client_sup.erl index 4622db1..e7f321b 100644 --- a/zomp/lib/otpr/zx/0.11.6/templates/example_server/src/_client_sup.erl +++ b/zomp/lib/otpr/zx/0.11.7/templates/example_server/src/_client_sup.erl @@ -35,9 +35,9 @@ | {shutdown, term()} | term(). %% @private -%% Spawns the first listener at the request of the 〘*PREFIX*〙_client_man when es:listen/1 -%% is called, or the next listener at the request of the currently listening 〘*PREFIX*〙_client -%% when a connection is made. +%% Spawns the first listener at the request of the 〘*PREFIX*〙_client_man when +%% 〘*APP MOD*〙:listen/1 is called, or the next listener at the request of the +%% currently listening 〘*PREFIX*〙_client when a connection is made. %% %% Error conditions, supervision strategies and other important issues are %% explained in the supervisor module docs: diff --git a/zomp/lib/otpr/zx/0.11.6/templates/example_server/src/_clients.erl b/zomp/lib/otpr/zx/0.11.7/templates/example_server/src/_clients.erl similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/example_server/src/_clients.erl rename to zomp/lib/otpr/zx/0.11.7/templates/example_server/src/_clients.erl index 720eb18..f8dda3b 100644 --- a/zomp/lib/otpr/zx/0.11.6/templates/example_server/src/_clients.erl +++ b/zomp/lib/otpr/zx/0.11.7/templates/example_server/src/_clients.erl @@ -32,17 +32,17 @@ start_link() -> init(none) -> RestartStrategy = {rest_for_one, 1, 60}, - ClientSup = {〘*PREFIX*〙_client_sup, - {〘*PREFIX*〙_client_sup, start_link, []}, - permanent, - 5000, - supervisor, - [〘*PREFIX*〙_client_sup]}, ClientMan = {〘*PREFIX*〙_client_man, {〘*PREFIX*〙_client_man, start_link, []}, permanent, 5000, worker, [〘*PREFIX*〙_client_man]}, + ClientSup = {〘*PREFIX*〙_client_sup, + {〘*PREFIX*〙_client_sup, start_link, []}, + permanent, + 5000, + supervisor, + [〘*PREFIX*〙_client_sup]}, Children = [ClientSup, ClientMan], {ok, {RestartStrategy, Children}}. diff --git a/zomp/lib/otpr/zx/0.11.6/templates/example_server/src/_sup.erl b/zomp/lib/otpr/zx/0.11.7/templates/example_server/src/_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/example_server/src/_sup.erl rename to zomp/lib/otpr/zx/0.11.7/templates/example_server/src/_sup.erl diff --git a/zomp/lib/otpr/zx/0.11.6/templates/gitignore b/zomp/lib/otpr/zx/0.11.7/templates/gitignore similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/gitignore rename to zomp/lib/otpr/zx/0.11.7/templates/gitignore diff --git a/zomp/lib/otpr/zx/0.11.6/templates/hellowx/appmod.erl b/zomp/lib/otpr/zx/0.11.7/templates/hellowx/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/hellowx/appmod.erl rename to zomp/lib/otpr/zx/0.11.7/templates/hellowx/appmod.erl diff --git a/zomp/lib/otpr/zx/0.11.6/templates/hellowx/src/_con.erl b/zomp/lib/otpr/zx/0.11.7/templates/hellowx/src/_con.erl similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/hellowx/src/_con.erl rename to zomp/lib/otpr/zx/0.11.7/templates/hellowx/src/_con.erl diff --git a/zomp/lib/otpr/zx/0.11.6/templates/hellowx/src/_gui.erl b/zomp/lib/otpr/zx/0.11.7/templates/hellowx/src/_gui.erl similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/hellowx/src/_gui.erl rename to zomp/lib/otpr/zx/0.11.7/templates/hellowx/src/_gui.erl diff --git a/zomp/lib/otpr/zx/0.11.6/templates/hellowx/src/_sup.erl b/zomp/lib/otpr/zx/0.11.7/templates/hellowx/src/_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/hellowx/src/_sup.erl rename to zomp/lib/otpr/zx/0.11.7/templates/hellowx/src/_sup.erl diff --git a/zomp/lib/otpr/zx/0.11.6/templates/licenses/apache2.txt b/zomp/lib/otpr/zx/0.11.7/templates/licenses/apache2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/licenses/apache2.txt rename to zomp/lib/otpr/zx/0.11.7/templates/licenses/apache2.txt diff --git a/zomp/lib/otpr/zx/0.11.6/templates/licenses/bsd2.txt b/zomp/lib/otpr/zx/0.11.7/templates/licenses/bsd2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/licenses/bsd2.txt rename to zomp/lib/otpr/zx/0.11.7/templates/licenses/bsd2.txt diff --git a/zomp/lib/otpr/zx/0.11.6/templates/licenses/bsd3.txt b/zomp/lib/otpr/zx/0.11.7/templates/licenses/bsd3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/licenses/bsd3.txt rename to zomp/lib/otpr/zx/0.11.7/templates/licenses/bsd3.txt diff --git a/zomp/lib/otpr/zx/0.11.6/templates/licenses/cc0.txt b/zomp/lib/otpr/zx/0.11.7/templates/licenses/cc0.txt similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/licenses/cc0.txt rename to zomp/lib/otpr/zx/0.11.7/templates/licenses/cc0.txt diff --git a/zomp/lib/otpr/zx/0.11.6/templates/licenses/gpl3.txt b/zomp/lib/otpr/zx/0.11.7/templates/licenses/gpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/licenses/gpl3.txt rename to zomp/lib/otpr/zx/0.11.7/templates/licenses/gpl3.txt diff --git a/zomp/lib/otpr/zx/0.11.6/templates/licenses/lgpl3.txt b/zomp/lib/otpr/zx/0.11.7/templates/licenses/lgpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/licenses/lgpl3.txt rename to zomp/lib/otpr/zx/0.11.7/templates/licenses/lgpl3.txt diff --git a/zomp/lib/otpr/zx/0.11.6/templates/licenses/mit.txt b/zomp/lib/otpr/zx/0.11.7/templates/licenses/mit.txt similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/licenses/mit.txt rename to zomp/lib/otpr/zx/0.11.7/templates/licenses/mit.txt diff --git a/zomp/lib/otpr/zx/0.11.6/templates/licenses/mpl2.txt b/zomp/lib/otpr/zx/0.11.7/templates/licenses/mpl2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/licenses/mpl2.txt rename to zomp/lib/otpr/zx/0.11.7/templates/licenses/mpl2.txt diff --git a/zomp/lib/otpr/zx/0.11.7/templates/service_worker/worker.erl b/zomp/lib/otpr/zx/0.11.7/templates/service_worker/worker.erl new file mode 100644 index 0000000..433ae1c --- /dev/null +++ b/zomp/lib/otpr/zx/0.11.7/templates/service_worker/worker.erl @@ -0,0 +1,73 @@ +%%% @doc +%%% 〘*PROJECT NAME*〙: 〘*CAP SERVICE*〙 Worker +%%% @end + +-module(〘*PREFIX*〙_〘*SERVICE*〙). +-vsn("〘*VERSION*〙"). +-behavior(gen_server). +〘*AUTHOR*〙 +〘*COPYRIGHT*〙 +〘*LICENSE*〙 + +%% gen_server +-export([start_link/0]). +-export([init/1, handle_call/3, handle_cast/2, handle_info/2, + code_change/3, terminate/2]). +-include("$zx_include/zx_logger.hrl"). + + +%%% Type and Record Definitions + + +-record(s, + {}). + + +-type state() :: #s{}. + + + +%%% Interface + + + +%%% gen_server + +-spec start_link() -> Result + when Result :: {ok, pid()} + | {error, Reason :: term()}. + +start_link() -> + gen_server:start_link({local, ?MODULE}, ?MODULE, none, []). + + +init(none) -> + State = #s{}, + {ok, State}. + + +handle_call(Unexpected, From, State) -> + ok = log(warning, "Unexpected call from ~tp: ~tp", [From, Unexpected]), + {noreply, State}. + + +handle_cast(Unexpected, State) -> + ok = log(warning, "Unexpected cast: ~tp", [Unexpected]), + {noreply, State}. + + +handle_info(Unexpected, State) -> + ok = log(warning, "Unexpected info: ~tp", [Unexpected]), + {noreply, State}. + + +code_change(_, State, _) -> + {ok, State}. + + +terminate(_, _) -> + ok. + + + +%%% Doer Functions diff --git a/zomp/lib/otpr/zx/0.11.7/templates/service_worker/worker_man.erl b/zomp/lib/otpr/zx/0.11.7/templates/service_worker/worker_man.erl new file mode 100644 index 0000000..9b91209 --- /dev/null +++ b/zomp/lib/otpr/zx/0.11.7/templates/service_worker/worker_man.erl @@ -0,0 +1,119 @@ +%%% @doc +%%% 〘*PROJECT NAME*〙: 〘*CAP SERVICE*〙 Worker Manager +%%% @end + +-module(〘*PREFIX*〙_〘*SERVICE*〙_man). +-vsn("〘*VERSION*〙"). +-behavior(gen_server). +〘*AUTHOR*〙 +〘*COPYRIGHT*〙 +〘*LICENSE*〙 + +%% Worker interface +-export([enroll/0]). +%% gen_server +-export([start_link/0]). +-export([init/1, handle_call/3, handle_cast/2, handle_info/2, + code_change/3, terminate/2]). +-include("$zx_include/zx_logger.hrl"). + + +%%% Type and Record Definitions + + +-record(s, + {〘*SERVICE*〙s = [] :: [pid()]}). + + +-type state() :: #s{}. + + + +%%% Service Interface + + + +%%% Worker Interface + +-spec enroll() -> ok. +%% @doc +%% Workers register here after they initialize. + +enroll() -> + gen_server:cast(?MODULE, {enroll, self()}). + + + +%%% gen_server + +-spec start_link() -> Result + when Result :: {ok, pid()} + | {error, Reason :: term()}. + +start_link() -> + gen_server:start_link({local, ?MODULE}, ?MODULE, none, []). + + +init(none) -> + State = #s{}, + {ok, State}. + + +handle_call(Unexpected, From, State) -> + ok = log(warning, "Unexpected call from ~tp: ~tp", [From, Unexpected]), + {noreply, State}. + + +handle_cast({enroll, PID}, State) -> + NewState = do_enroll(PID, State), + {noreply, NewState}; +handle_cast(Unexpected, State) -> + ok = log(warning, "Unexpected cast: ~tp", [Unexpected]), + {noreply, State}. + + +handle_info({'DOWN', Mon, process, PID, Reason}, State) -> + NewState = handle_down(Mon, PID, Reason, State), + {noreply, NewState}; +handle_info(Unexpected, State) -> + ok = log(warning, "Unexpected info: ~tp", [Unexpected]), + {noreply, State}. + + +handle_down(Mon, PID, Reason, State = #s{clients = Clients}) -> + case lists:member(PID, Clients) of + true -> + NewClients = lists:delete(PID, Clients), + State#s{clients = NewClients}; + false -> + Unexpected = {'DOWN', Mon, process, PID, Reason}, + ok = log(warning, "Unexpected info: ~tp", [Unexpected]), + State + end. + + +code_change(_, State, _) -> + {ok, State}. + + +terminate(_, _) -> + ok. + + + +%%% Doer Functions + +-spec do_enroll(PID, State) -> NewState + when PID :: pid(), + State :: state(), + NewState :: state(). + +do_enroll(PID, State = #s{〘*SERVICE*〙s = 〘*CAP SERVICE*〙s}) -> + case lists:member(PID, 〘*CAP SERVICE*〙s) of + false -> + Mon = monitor(process, PID), + ok = log(info, "Enroll: ~tp @ ~tp", [PID, Mon]), + State#s{〘*SERVICE*〙s = [PID | 〘*CAP SERVICE*〙s]}; + true -> + State + end. diff --git a/zomp/lib/otpr/zx/0.11.7/templates/service_worker/worker_sup.erl b/zomp/lib/otpr/zx/0.11.7/templates/service_worker/worker_sup.erl new file mode 100644 index 0000000..e61e4b0 --- /dev/null +++ b/zomp/lib/otpr/zx/0.11.7/templates/service_worker/worker_sup.erl @@ -0,0 +1,49 @@ +%%% @doc +%%% 〘*PROJECT NAME*〙 : 〘*CAP SERVICE*〙 Worker Supervisor +%%% @end + +-module(〘*PREFIX*〙_〘*SERVICE*〙_sup). +-vsn("〘*VERSION*〙"). +-behaviour(supervisor). +〘*AUTHOR*〙 +〘*COPYRIGHT*〙 +〘*LICENSE*〙 + + +-export([start_acceptor/1]). +-export([start_link/0]). +-export([init/1]). + + +-spec start_acceptor(ListenSocket) -> Result + when ListenSocket :: gen_tcp:socket(), + Result :: {ok, pid()} + | {error, Reason}, + Reason :: {already_started, pid()} + | {shutdown, term()} + | term(). + +start_acceptor(ListenSocket) -> + supervisor:start_child(?MODULE, [ListenSocket]). + + +-spec start_link() -> {ok, pid()}. + +start_link() -> + supervisor:start_link({local, ?MODULE}, ?MODULE, none). + + +-spec init(none) -> {ok, {supervisor:sup_flags(), [supervisor:child_spec()]}}. +%% @private +%% The OTP init/1 function. + +init(none) -> + RestartStrategy = {simple_one_for_one, 1, 60}, + 〘*CAP SERVICE*〙 = + {〘*PREFIX*〙_〘*SERVICE*〙, + {〘*PREFIX*〙_〘*SERVICE*〙, start_link, []}, + temporary, + brutal_kill, + worker, + [〘*PREFIX*〙_〘*SERVICE*〙]}, + {ok, {RestartStrategy, [〘*CAP SERVICE*〙]}}. diff --git a/zomp/lib/otpr/zx/0.11.7/templates/service_worker/workers.erl b/zomp/lib/otpr/zx/0.11.7/templates/service_worker/workers.erl new file mode 100644 index 0000000..868f644 --- /dev/null +++ b/zomp/lib/otpr/zx/0.11.7/templates/service_worker/workers.erl @@ -0,0 +1,50 @@ +%%% @doc +%%% 〘*PROJECT NAME*〙: 〘*CAP SERVICE*〙 Service Supervisor +%%% +%%% This is the service-level supervisor of the system. It is the parent of both the +%%% client connection handlers and the client manager (which manages the client +%%% connection handlers). This is the child of 〘*PREFIX*〙_sup. +%%% +%%% See: http://erlang.org/doc/apps/kernel/application.html +%%% @end + +-module(〘*PREFIX*〙_〘*SERVICE*〙s). +-vsn("〘*VERSION*〙"). +-behavior(supervisor). +〘*AUTHOR*〙 +〘*COPYRIGHT*〙 +〘*LICENSE*〙 + +-export([start_link/0]). +-export([init/1]). + + +-spec start_link() -> {ok, pid()}. +%% @private +%% This supervisor's own start function. + +start_link() -> + supervisor:start_link({local, ?MODULE}, ?MODULE, none). + +-spec init(none) -> {ok, {supervisor:sup_flags(), [supervisor:child_spec()]}}. +%% @private +%% The OTP init/1 function. + +init(none) -> + RestartStrategy = {rest_for_one, 1, 60}, + 〘*CAP SERVICE*〙Man = + {〘*PREFIX*〙_〘*SERVICE*〙_man, + {〘*PREFIX*〙_〘*SERVICE*〙_man, start_link, []}, + permanent, + 5000, + worker, + [〘*PREFIX*〙_〘*SERVICE*〙_man]}, + 〘*CAP SERVICE*〙Sup = + {〘*PREFIX*〙_〘*SERVICE*〙_sup, + {〘*PREFIX*〙_〘*SERVICE*〙_sup, start_link, []}, + permanent, + 5000, + supervisor, + [〘*PREFIX*〙_〘*SERVICE*〙_sup]}, + Children = [〘*CAP SERVICE*〙Sup, 〘*CAP SERVICE*〙Man], + {ok, {RestartStrategy, Children}}. diff --git a/zomp/lib/otpr/zx/0.11.6/templates/simplecli.erl b/zomp/lib/otpr/zx/0.11.7/templates/simplecli.erl similarity index 100% rename from zomp/lib/otpr/zx/0.11.6/templates/simplecli.erl rename to zomp/lib/otpr/zx/0.11.7/templates/simplecli.erl diff --git a/zomp/lib/otpr/zx/0.11.6/zomp.meta b/zomp/lib/otpr/zx/0.11.7/zomp.meta similarity index 91% rename from zomp/lib/otpr/zx/0.11.6/zomp.meta rename to zomp/lib/otpr/zx/0.11.7/zomp.meta index 89f14bd..e793fc9 100644 --- a/zomp/lib/otpr/zx/0.11.6/zomp.meta +++ b/zomp/lib/otpr/zx/0.11.7/zomp.meta @@ -9,7 +9,7 @@ {license,"MIT"}. {modules,[]}. {name,"zx"}. -{package_id,{"otpr","zx",{0,11,6}}}. +{package_id,{"otpr","zx",{0,11,7}}}. {prefix,"zx_"}. {repo_url,"https://gitlab.com/zxq9/zx"}. {tags,["tools","package manager","erlang"]}.