-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Conversation
programs/eosio-launcher/main.cpp
Outdated
|
||
if(!c.running()) { | ||
cerr << "child not running after spawn " << cmd << endl; | ||
for (int i = 0; i > 0; i++) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We really want this tight loop, with no delay, running till i rolls over to negative?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A lot of this code is copy-pasted from elsewhere in the launcher. I will simplify it and pull it out into a function.
programs/eosio-launcher/main.cpp
Outdated
bp::env["EOSIO_HOME"] = host.eosio_home, | ||
bp::env["EOSIO_NODE"] = node_num ); | ||
|
||
if(!c.running()) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we make the following lines a method to use here and below?
@@ -33,8 +35,8 @@ rm $datadir/stderr.txt | |||
ln -s $log $datadir/stderr.txt | |||
|
|||
relaunch() { | |||
echo "$rundir/$prog $* --data-dir $datadir --config-dir etc/eosio/node_$EOSIO_NODE > $datadir/stdout.txt 2>> $datadir/$log " | |||
nohup $rundir/$prog $* --data-dir $datadir --config-dir etc/eosio/node_$EOSIO_NODE > $datadir/stdout.txt 2>> $datadir/$log & | |||
echo "$rundir/$prog $qargs $* --data-dir $datadir --config-dir etc/eosio/node_$EOSIO_NODE > $datadir/stdout.txt 2>> $datadir/$log " |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this not run into the same issues with the * exploding to all the files in the current directory?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No because I have added quotes around the * argument. This is not a very general solution but works for --filter-on *.
Add use of the launcher-generated bios_boot.sh as the default for existing tests
Minor modifications to some tests to work with bios_boot.sh (usually buying more RAM)
Modify some tests to use the existing bootstrap method (they require partial bootstrapping)
Add a new launcher test that tests launcher options such as --bounce and --down