зеркало из https://github.com/mozilla/labs-vcap.git
rename 'wait' debug mode to 'suspend' for clarity's sake
Change-Id: I8ddf1845b1c62009f8db879a372d110a45f8fa4a
This commit is contained in:
Родитель
f2859f5ecb
Коммит
dd4e26fbb9
|
@ -152,7 +152,7 @@ runtimes:
|
||||||
version: 1.6.0
|
version: 1.6.0
|
||||||
debug_modes:
|
debug_modes:
|
||||||
- run
|
- run
|
||||||
- wait
|
- suspend
|
||||||
php:
|
php:
|
||||||
version: 5.3.[2-6]
|
version: 5.3.[2-6]
|
||||||
erlangR14B02:
|
erlangR14B02:
|
||||||
|
|
|
@ -66,7 +66,7 @@ runtimes:
|
||||||
debug_env:
|
debug_env:
|
||||||
run:
|
run:
|
||||||
- JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=n"
|
- JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=n"
|
||||||
wait:
|
suspend:
|
||||||
- JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=y"
|
- JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=y"
|
||||||
php:
|
php:
|
||||||
executable: php
|
executable: php
|
||||||
|
|
|
@ -868,7 +868,7 @@ module DEA
|
||||||
if state && state['state'] == 'RUNNING'
|
if state && state['state'] == 'RUNNING'
|
||||||
block.call(true)
|
block.call(true)
|
||||||
timer.cancel
|
timer.cancel
|
||||||
elsif instance[:debug_mode] != "wait"
|
elsif instance[:debug_mode] != "suspend"
|
||||||
attempts += 1
|
attempts += 1
|
||||||
if attempts > 600 || instance[:state] != :STARTING # 5 minutes or instance was stopped
|
if attempts > 600 || instance[:state] != :STARTING # 5 minutes or instance was stopped
|
||||||
block.call(false)
|
block.call(false)
|
||||||
|
|
|
@ -117,7 +117,7 @@ runtimes:
|
||||||
version: 1.6.0
|
version: 1.6.0
|
||||||
debug_modes:
|
debug_modes:
|
||||||
- run
|
- run
|
||||||
- wait
|
- suspend
|
||||||
php:
|
php:
|
||||||
version: 5.3.[2-6]
|
version: 5.3.[2-6]
|
||||||
erlangR14B02:
|
erlangR14B02:
|
||||||
|
|
|
@ -75,7 +75,7 @@ runtimes:
|
||||||
debug_env:
|
debug_env:
|
||||||
run:
|
run:
|
||||||
- JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=n"
|
- JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=n"
|
||||||
wait:
|
suspend:
|
||||||
- JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=y"
|
- JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=y"
|
||||||
<% end %>
|
<% end %>
|
||||||
<% if node[:dea][:runtimes].include?("erlang") %>
|
<% if node[:dea][:runtimes].include?("erlang") %>
|
||||||
|
|
Загрузка…
Ссылка в новой задаче