Support --entry-stream argument
This commit is contained in:
		
							
								
								
									
										26
									
								
								run.sh
									
									
									
									
									
								
							
							
						
						
									
										26
									
								
								run.sh
									
									
									
									
									
								
							@@ -8,7 +8,7 @@
 | 
				
			|||||||
set -e
 | 
					set -e
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Prefer possible `cargo build --all` binaries over PATH binaries
 | 
					# Prefer possible `cargo build --all` binaries over PATH binaries
 | 
				
			||||||
PATH=$PWD/targt/debug:$PATH
 | 
					PATH=$PWD/target/debug:$PATH
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ok=true
 | 
					ok=true
 | 
				
			||||||
for program in solana-{genesis,keygen,fullnode{,-config}}; do
 | 
					for program in solana-{genesis,keygen,fullnode{,-config}}; do
 | 
				
			||||||
@@ -23,6 +23,17 @@ $ok || {
 | 
				
			|||||||
  exit 1
 | 
					  exit 1
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					entryStreamSocket=
 | 
				
			||||||
 | 
					while [[ -n $1 ]]; do
 | 
				
			||||||
 | 
					  if [[ $1 = --entry-stream ]]; then
 | 
				
			||||||
 | 
					    entryStreamSocket=$2
 | 
				
			||||||
 | 
					    shift 2
 | 
				
			||||||
 | 
					  else
 | 
				
			||||||
 | 
					    echo "Unknown argument: $1"
 | 
				
			||||||
 | 
					    exit 1
 | 
				
			||||||
 | 
					  fi
 | 
				
			||||||
 | 
					done
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export RUST_LOG=${RUST_LOG:-solana=info} # if RUST_LOG is unset, default to info
 | 
					export RUST_LOG=${RUST_LOG:-solana=info} # if RUST_LOG is unset, default to info
 | 
				
			||||||
export RUST_BACKTRACE=1
 | 
					export RUST_BACKTRACE=1
 | 
				
			||||||
dataDir=$PWD/target/"$(basename "$0" .sh)"
 | 
					dataDir=$PWD/target/"$(basename "$0" .sh)"
 | 
				
			||||||
@@ -42,10 +53,15 @@ solana-genesis \
 | 
				
			|||||||
solana-drone --keypair "$dataDir"/config/drone-keypair.json &
 | 
					solana-drone --keypair "$dataDir"/config/drone-keypair.json &
 | 
				
			||||||
drone=$!
 | 
					drone=$!
 | 
				
			||||||
 | 
					
 | 
				
			||||||
solana-fullnode \
 | 
					args=(
 | 
				
			||||||
  --identity "$dataDir"/config/leader-config.json \
 | 
					  --identity "$dataDir"/config/leader-config.json
 | 
				
			||||||
  --ledger "$dataDir"/ledger/ \
 | 
					  --ledger "$dataDir"/ledger/
 | 
				
			||||||
  --rpc-port 8899 &
 | 
					  --rpc-port 8899
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
 | 
					if [[ -n $entryStreamSocket ]]; then
 | 
				
			||||||
 | 
					  args+=(--entry-stream "$entryStreamSocket")
 | 
				
			||||||
 | 
					fi
 | 
				
			||||||
 | 
					solana-fullnode "${args[@]}" &
 | 
				
			||||||
fullnode=$!
 | 
					fullnode=$!
 | 
				
			||||||
 | 
					
 | 
				
			||||||
abort() {
 | 
					abort() {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user