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.

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

Fix the race condition error `erlsrv.exe: unrecognize option` #381

Merged
merged 2 commits into from Jun 28, 2019

Conversation

@gilbertwong96
Copy link
Contributor

gilbertwong96 commented Jun 28, 2019

No description provided.

@turtleDeng turtleDeng merged commit 081293a into develop Jun 28, 2019
@turtleDeng turtleDeng deleted the fix-windows-install branch Jun 28, 2019
Anakin-Hao added a commit to TeamAlbi/emqx-rel that referenced this pull request Sep 23, 2019
V3.2 (#4)
* Version 2.3.10

* Version 2.3.11

* Add issue template

* Release v3.0-beta.1

* Fix build deb fail

* Fix build deb fail

* Release v3.0-beta.4

* Update emqx_ci.sh

* Update jenkins_nightlybuild.sh

Change Dockerfile EMQX_VERSION

* Update release build script

* Fix syntax error

* Add more parameters to emqx_ci.sh

* Fix release build path

* Delete test script

* Release v3.0-beta.4

* release v3.0-rc.1

* Change buildserver

* rename EMQ_* to EMQX_*

rename EMQ_NODE_NAME to EMQX_NODE_NAME
rename EMQ_NODE_COOKIE to EMQX_NODE_COOKIE

* Rename EMQ_NODE_NAME to EMQX_NODE_NAME (emqx#233)

* Rename EMQ_NODE_NAME to EMQX_NODE_NAME

* EMQX v3.0-rc.2

* Switch to logger (emqx#241)

* Rm lager/syslog

* Rm goldrush

* Delete find_erts_dir function

emqx release should always use packed erts, not the system provided

* Avoid setting nodename and cookie for config management (emqx#238)

* Merge emqx30 to emqx30 release (emqx#245)

* Switch to logger (emqx#241)

* Rm lager/syslog

* Rm goldrush

* Delete find_erts_dir function

emqx release should always use packed erts, not the system provided

* Avoid setting nodename and cookie for config management (emqx#238)

* Version 3.0-rc.3

* Emqx30 release (emqx#246)

* Merge emqx30 to emqx30 release (emqx#245)

* Switch to logger (emqx#241)

* Rm lager/syslog

* Rm goldrush

* Delete find_erts_dir function

emqx release should always use packed erts, not the system provided

* Avoid setting nodename and cookie for config management (emqx#238)

* Version 3.0-rc.3

* Put RUNNER_ROOT_DIR logic to vars.config

* $RUNNER_SCRIPT to replace $SCRIPT_DIR/emqx and $RUNNER_BIN_DIR/emqx

* Parameterise dependency version (default to v3.0-rc.3)

* Rename vars.config to package-vars.config

* Add back vars.config from emqx30 branch

* Parameterise release profile

* Clean up emqx_ctl

* Don't start delay_publish plugin by default

* Workaround cuttlefish escape

* Build with cuttlefish

We used to commit the cuttlefish binary directly into the git, but this way we have to update the binary every time the cuttlefish has code changes.

In this commit I removed the cuttlefish binary from the repo. When
buiding the project, the new built binary will be copied to the release directory.

* Don't start delay_publish plugin by default

* Build with cuttlefish

We used to commit the cuttlefish binary directly into the git, but this way we have to update the binary every time the cuttlefish has code changes.

In this commit I removed the cuttlefish binary from the repo. When
buiding the project, the new built binary will be copied to the release directory.

* Version 3.0-rc.4

* Reduce dep size (emqx#254)

* Add git-emqx method to get dependencies
Prior to this change, it has to waste a lot of time to fetch whole git
repository as a dependency

This change fix this issue.

* Refactor makefile

* Simplify deps list

* Suppress git clone warning for detached head

* Moved from /usr/sbin to /use/bin

* Add curl to Dockerfile

* Reanme

* Change Dockerfile

* chmod +x

* Fix deb build failed on AWS

* Fix deb build failed on AWS

* Fix deb build failed on AWS

* Update centos6.8 git

* Always assume emqx is installed to /usr/lib/emqx

Stop guessing /usr/lib64 to overly complicate it

* Add curl to Dockerfile

* Reanme

* Change Dockerfile

* chmod +x

* Fix deb build failed on AWS

* Fix deb build failed on AWS

* Fix deb build failed on AWS

* Update centos6.8 git

* Be nice to old version git.

Git before 1.8 has no -c option and does not support shallow clone

* Revert "Be nice to old version git."

This reverts commit 2c2571b.

* Be nice to old version git.

Git before 1.8 has no -c option and does not support shallow clone

* Add install test

* update

* update

* update

* update release ci

* update

* tag -> branch

* Rename VSN in Makefile to a less-clashing name (emqx#269)

Also made git clone backward compatible for git older than 1.8
because -b option can not be used with git tag in git 1.7

* No AUTOPATCH for emqx project (emqx#270)

* Update release and nightly build script (emqx#273)

* update

* Update mac build

* Delete useless variables

* remove name2 and name3

* Fix git describe in erlang.mk

To make it backward compatible because --first-parent option
is not available in git 1.8 etc.
Also deleted --dirty option so to allow auto patching
deps without always having a 'dirty' vsn in e.g. emqx.app

* Download erlang.mk and use git tag in appfile vsn

* Add check package version

* update

* merge nightly ci and release ci

* update

* update

* update Dockerfile and delete script

* Emqx30 zhanght (emqx#283)

* Update erlang 21.2

* Merge Emqx32 to emqx30 (emqx#287)

* Fix sed and if condition on ubuntu

* Add +spp option

* Append into vm.args only when arg is not configured (emqx#286)

* Rm emqx32 branch dep

* Add emqx

* Add deps demo

* Tag v3.0.0

* V3.0.0 -> v3.0.0

* EMQX_DEPS_DEFAULT_VSN -> master

* Add test scripts to test the whole emqx projects (emqx#292)

* Add test scripts to test the whole emqx projects

* Get dependencies when test emqx-rel

* Revert "Add test scripts to test the whole emqx projects (emqx#292)" (emqx#295)

This reverts commit f4b0302.

* Merge emqx30 (emqx#304)

* Cut plugins for edge (emqx#288)

* Add tests logs

* Reload config when restart or reboot emqx (emqx#303)

* Version 3.0.1

* Version v3.0.1

* Change emqx_auth_ladp tests config

* Branch testing

* Branch develop

* Create 'data/scripts' folder for lua-hook scripts

* Revert "Create 'data/scripts' folder for lua-hook scripts" (emqx#313)

This reverts commit 465ea80.

* Create 'data/scripts' folder for lua-hook scripts (emqx#314)

* Add plugin emqx-psk-file (emqx#318)

* Add PSK file plugin for edge

* Update tests script

* Change tests $EMQX_DEPS_DEFAULT_VSN

* Update run_emqx.sh

* Update run_emqx.sh

* Change tests

* Remoce emqx_psk_file from tests/emqx.spec

* Rule engine (emqx#324)

* Add 'jpparse', 'sqlparse' and 'emqx-rule-engine' libraries

* Fix edge compile fail

* Start rule-engine by default

* Put dependencies in order

* Add minirest tests

* [WIP] Make possible to build release with rebar3 (emqx#328)

This is the very first step deprecating erlang.mk

Not changing dependency versioning and locking issues in this PR,
not that it's not important, but simply because it is a whole different issue
which can be and should be addressed separately.

Marked as WIP because some dependencies have PR to merge.

* Revert "[WIP] Make possible to build release with rebar3 (emqx#328)"

This reverts commit 7b28bd5.

* Fix cli args passing issue

To support args that contains white spaces and/or specail characters that reserved by shell, the args need to be quoted when passing them between shell scripts.

For example:

```shell
./bin/emqx_ctl rules create 'inspect' 'message.publish' 'select * from t1' 'default:debug_action' '{}' 'Rule for debug'

```

* Tests add emqx_storm

* Support automated edge build

* Set emqx_storm as auto loaded plugin of emqx edge

* Add getopt

* Delete .ci

* Fix start fail after changing log.rotation.size

* Fix bin/emqx failure

* Fix README commands error

* Update version

* Remove emqx_passwd minirest tests

* [WIP] [TAKE-2] Make possible to build release with rebar3 (emqx#330)

* Make possible to build release with rebar3

* Fix rebar3 release

* Delete useless deps and fix edge build

* Version 3.1.1

* Rename emqx_storm to emqx_cube

* Optimize details of rebar3 release

* Update README (emqx#347)

* Update README

* Add getopt in rebar.config

* Update post-compile.sh

/bin/bash -> /bin/sh

* Fix wrong description in README

* Support cleaning beam code rule in makefile

* Restore emqx_pkg rule in makefile

* Build for windows (emqx#350)

* Fix wrong FilePath in rebar.config.script

* Finish post-compile.cmd for windows

* Make os:cmd compatible in windows

* Add post hooks of bsd platform

* Fix first failure of windows boot

* Update readme (emqx#348)

* Update readme

* Tweak the text

* Support `make run` in emqx_rel

* Update tests script

* Restore emqx_plugin_template in emqx deps

* Run rebar ct (emqx#354)

* Update readme
Updated the commands to run emqx from rebar3 build dir.
Deleted Windows section as it was only relevant when using erlang.mk
Deleted docker build info for now.

* Run rebar ct for emqx and plugins

* Add "run" rule in the makefile and fix readme

* Delete useless option in rebar.config

* Change default make rule

* Improve makefile logic

* From git tag get version

* Automatically get the emqx deps

* Fix code format

* Better build (emqx#364)

* Comment observer apps

* Fix failure build on windows platform

* Support generating release with elixir deps

* Integrate elixir plugin

* Dynamically integrate elixir plugin

* Restore observer plugin

* Delete emqx_elixir_plugin

* Add `rm -rf _checkouts` in distclean rule

* Transfer emqx_auth_http.conf (emqx#367)

* Support branch transition for release branch

* Enhance makefile
Prior to this change, emqx_rel will support get all dependencies from
deps git repo and cannot automatically choose the tag it would release

This change make emqx build more intelligent

* Delete useless comment

* Fix the compat windows bug

* Fix windows service (emqx#378)

* Fix the race condition error `erlsrv.exe: unrecognize option` (emqx#381)

* Fix the race condition error `erlsrv.exe: unrecognize option`

* Disable debug option for erlsrv and add console log for emqx start

* Add emqx_bridge_mqtt (emqx#382)

* Add emqx_bridge_mqtt

* Add emqx_bridge_mqtt into loaded_plugins.tmpl

* v3.2-rc.3

* Make emqx-rel build more robust

* fix emqx_ctl.cmd to properly get cookies and node name from config

* do not add args_file twice, generated by cuttlefish

included in generated_config_args variable

* Support building emqx-rel without installing rebar3

* Delay windows servie auto start when windows reboot

* Delete `rebar3 update`

* Fix rebar.config.script bug

* Add the deploy directory and update the makefile

* Fixed a bug with busybox's sed command

* Replace the _ with - for rebar3 profiles

* Fix rebar error

* Fix apt upgrade error
Anakin-Hao added a commit to TeamAlbi/emqx-rel that referenced this pull request Sep 23, 2019
V3.2 (#5)
* Version 2.3.10

* Version 2.3.11

* Add issue template

* Release v3.0-beta.1

* Fix build deb fail

* Fix build deb fail

* Release v3.0-beta.4

* Update emqx_ci.sh

* Update jenkins_nightlybuild.sh

Change Dockerfile EMQX_VERSION

* Update release build script

* Fix syntax error

* Add more parameters to emqx_ci.sh

* Fix release build path

* Delete test script

* Release v3.0-beta.4

* release v3.0-rc.1

* Change buildserver

* rename EMQ_* to EMQX_*

rename EMQ_NODE_NAME to EMQX_NODE_NAME
rename EMQ_NODE_COOKIE to EMQX_NODE_COOKIE

* Rename EMQ_NODE_NAME to EMQX_NODE_NAME (emqx#233)

* Rename EMQ_NODE_NAME to EMQX_NODE_NAME

* EMQX v3.0-rc.2

* Switch to logger (emqx#241)

* Rm lager/syslog

* Rm goldrush

* Delete find_erts_dir function

emqx release should always use packed erts, not the system provided

* Avoid setting nodename and cookie for config management (emqx#238)

* Merge emqx30 to emqx30 release (emqx#245)

* Switch to logger (emqx#241)

* Rm lager/syslog

* Rm goldrush

* Delete find_erts_dir function

emqx release should always use packed erts, not the system provided

* Avoid setting nodename and cookie for config management (emqx#238)

* Version 3.0-rc.3

* Emqx30 release (emqx#246)

* Merge emqx30 to emqx30 release (emqx#245)

* Switch to logger (emqx#241)

* Rm lager/syslog

* Rm goldrush

* Delete find_erts_dir function

emqx release should always use packed erts, not the system provided

* Avoid setting nodename and cookie for config management (emqx#238)

* Version 3.0-rc.3

* Put RUNNER_ROOT_DIR logic to vars.config

* $RUNNER_SCRIPT to replace $SCRIPT_DIR/emqx and $RUNNER_BIN_DIR/emqx

* Parameterise dependency version (default to v3.0-rc.3)

* Rename vars.config to package-vars.config

* Add back vars.config from emqx30 branch

* Parameterise release profile

* Clean up emqx_ctl

* Don't start delay_publish plugin by default

* Workaround cuttlefish escape

* Build with cuttlefish

We used to commit the cuttlefish binary directly into the git, but this way we have to update the binary every time the cuttlefish has code changes.

In this commit I removed the cuttlefish binary from the repo. When
buiding the project, the new built binary will be copied to the release directory.

* Don't start delay_publish plugin by default

* Build with cuttlefish

We used to commit the cuttlefish binary directly into the git, but this way we have to update the binary every time the cuttlefish has code changes.

In this commit I removed the cuttlefish binary from the repo. When
buiding the project, the new built binary will be copied to the release directory.

* Version 3.0-rc.4

* Reduce dep size (emqx#254)

* Add git-emqx method to get dependencies
Prior to this change, it has to waste a lot of time to fetch whole git
repository as a dependency

This change fix this issue.

* Refactor makefile

* Simplify deps list

* Suppress git clone warning for detached head

* Moved from /usr/sbin to /use/bin

* Add curl to Dockerfile

* Reanme

* Change Dockerfile

* chmod +x

* Fix deb build failed on AWS

* Fix deb build failed on AWS

* Fix deb build failed on AWS

* Update centos6.8 git

* Always assume emqx is installed to /usr/lib/emqx

Stop guessing /usr/lib64 to overly complicate it

* Add curl to Dockerfile

* Reanme

* Change Dockerfile

* chmod +x

* Fix deb build failed on AWS

* Fix deb build failed on AWS

* Fix deb build failed on AWS

* Update centos6.8 git

* Be nice to old version git.

Git before 1.8 has no -c option and does not support shallow clone

* Revert "Be nice to old version git."

This reverts commit 2c2571b.

* Be nice to old version git.

Git before 1.8 has no -c option and does not support shallow clone

* Add install test

* update

* update

* update

* update release ci

* update

* tag -> branch

* Rename VSN in Makefile to a less-clashing name (emqx#269)

Also made git clone backward compatible for git older than 1.8
because -b option can not be used with git tag in git 1.7

* No AUTOPATCH for emqx project (emqx#270)

* Update release and nightly build script (emqx#273)

* update

* Update mac build

* Delete useless variables

* remove name2 and name3

* Fix git describe in erlang.mk

To make it backward compatible because --first-parent option
is not available in git 1.8 etc.
Also deleted --dirty option so to allow auto patching
deps without always having a 'dirty' vsn in e.g. emqx.app

* Download erlang.mk and use git tag in appfile vsn

* Add check package version

* update

* merge nightly ci and release ci

* update

* update

* update Dockerfile and delete script

* Emqx30 zhanght (emqx#283)

* Update erlang 21.2

* Merge Emqx32 to emqx30 (emqx#287)

* Fix sed and if condition on ubuntu

* Add +spp option

* Append into vm.args only when arg is not configured (emqx#286)

* Rm emqx32 branch dep

* Add emqx

* Add deps demo

* Tag v3.0.0

* V3.0.0 -> v3.0.0

* EMQX_DEPS_DEFAULT_VSN -> master

* Add test scripts to test the whole emqx projects (emqx#292)

* Add test scripts to test the whole emqx projects

* Get dependencies when test emqx-rel

* Revert "Add test scripts to test the whole emqx projects (emqx#292)" (emqx#295)

This reverts commit f4b0302.

* Merge emqx30 (emqx#304)

* Cut plugins for edge (emqx#288)

* Add tests logs

* Reload config when restart or reboot emqx (emqx#303)

* Version 3.0.1

* Version v3.0.1

* Change emqx_auth_ladp tests config

* Branch testing

* Branch develop

* Create 'data/scripts' folder for lua-hook scripts

* Revert "Create 'data/scripts' folder for lua-hook scripts" (emqx#313)

This reverts commit 465ea80.

* Create 'data/scripts' folder for lua-hook scripts (emqx#314)

* Add plugin emqx-psk-file (emqx#318)

* Add PSK file plugin for edge

* Update tests script

* Change tests $EMQX_DEPS_DEFAULT_VSN

* Update run_emqx.sh

* Update run_emqx.sh

* Change tests

* Remoce emqx_psk_file from tests/emqx.spec

* Rule engine (emqx#324)

* Add 'jpparse', 'sqlparse' and 'emqx-rule-engine' libraries

* Fix edge compile fail

* Start rule-engine by default

* Put dependencies in order

* Add minirest tests

* [WIP] Make possible to build release with rebar3 (emqx#328)

This is the very first step deprecating erlang.mk

Not changing dependency versioning and locking issues in this PR,
not that it's not important, but simply because it is a whole different issue
which can be and should be addressed separately.

Marked as WIP because some dependencies have PR to merge.

* Revert "[WIP] Make possible to build release with rebar3 (emqx#328)"

This reverts commit 7b28bd5.

* Fix cli args passing issue

To support args that contains white spaces and/or specail characters that reserved by shell, the args need to be quoted when passing them between shell scripts.

For example:

```shell
./bin/emqx_ctl rules create 'inspect' 'message.publish' 'select * from t1' 'default:debug_action' '{}' 'Rule for debug'

```

* Tests add emqx_storm

* Support automated edge build

* Set emqx_storm as auto loaded plugin of emqx edge

* Add getopt

* Delete .ci

* Fix start fail after changing log.rotation.size

* Fix bin/emqx failure

* Fix README commands error

* Update version

* Remove emqx_passwd minirest tests

* [WIP] [TAKE-2] Make possible to build release with rebar3 (emqx#330)

* Make possible to build release with rebar3

* Fix rebar3 release

* Delete useless deps and fix edge build

* Version 3.1.1

* Rename emqx_storm to emqx_cube

* Optimize details of rebar3 release

* Update README (emqx#347)

* Update README

* Add getopt in rebar.config

* Update post-compile.sh

/bin/bash -> /bin/sh

* Fix wrong description in README

* Support cleaning beam code rule in makefile

* Restore emqx_pkg rule in makefile

* Build for windows (emqx#350)

* Fix wrong FilePath in rebar.config.script

* Finish post-compile.cmd for windows

* Make os:cmd compatible in windows

* Add post hooks of bsd platform

* Fix first failure of windows boot

* Update readme (emqx#348)

* Update readme

* Tweak the text

* Support `make run` in emqx_rel

* Update tests script

* Restore emqx_plugin_template in emqx deps

* Run rebar ct (emqx#354)

* Update readme
Updated the commands to run emqx from rebar3 build dir.
Deleted Windows section as it was only relevant when using erlang.mk
Deleted docker build info for now.

* Run rebar ct for emqx and plugins

* Add "run" rule in the makefile and fix readme

* Delete useless option in rebar.config

* Change default make rule

* Improve makefile logic

* From git tag get version

* Automatically get the emqx deps

* Fix code format

* Better build (emqx#364)

* Comment observer apps

* Fix failure build on windows platform

* Support generating release with elixir deps

* Integrate elixir plugin

* Dynamically integrate elixir plugin

* Restore observer plugin

* Delete emqx_elixir_plugin

* Add `rm -rf _checkouts` in distclean rule

* Transfer emqx_auth_http.conf (emqx#367)

* Support branch transition for release branch

* Enhance makefile
Prior to this change, emqx_rel will support get all dependencies from
deps git repo and cannot automatically choose the tag it would release

This change make emqx build more intelligent

* Delete useless comment

* Fix the compat windows bug

* Fix windows service (emqx#378)

* Fix the race condition error `erlsrv.exe: unrecognize option` (emqx#381)

* Fix the race condition error `erlsrv.exe: unrecognize option`

* Disable debug option for erlsrv and add console log for emqx start

* Add emqx_bridge_mqtt (emqx#382)

* Add emqx_bridge_mqtt

* Add emqx_bridge_mqtt into loaded_plugins.tmpl

* v3.2-rc.3

* Make emqx-rel build more robust

* fix emqx_ctl.cmd to properly get cookies and node name from config

* do not add args_file twice, generated by cuttlefish

included in generated_config_args variable

* Support building emqx-rel without installing rebar3

* Delay windows servie auto start when windows reboot

* Delete `rebar3 update`

* Fix rebar.config.script bug

* Add the deploy directory and update the makefile

* Fixed a bug with busybox's sed command

* Replace the _ with - for rebar3 profiles

* Fix rebar error

* Fix apt upgrade error
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.