From 8153c02995a3029217b994c9720d2387be57ae4f Mon Sep 17 00:00:00 2001 From: Ray Ozzie Date: Mon, 21 Mar 2016 21:10:53 -0700 Subject: [PATCH] asdf --- start.sh | 38 +++++++++++++------------------------- start.sh~ | 31 ++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 26 deletions(-) diff --git a/start.sh b/start.sh index c07955f..d3db064 100755 --- a/start.sh +++ b/start.sh @@ -2,21 +2,17 @@ # Display the environment, which is useful when debugging -echo "**************************************************************" -echo "**************************************************************" -echo "Environment:" +echo "******************" +echo "*** Environment:" env -echo "**************************************************************" -echo "**************************************************************" +echo "******************" echo "" # Configure the global and local configuration files via the environment -echo "**************************************************************" -echo "**************************************************************" -echo "Gateway Configuration:" -echo "**************************************************************" -echo "**************************************************************" +echo "******************" +echo "*** Configuration:" +echo "******************" if [[ $GATEWAY_NAME == "" ]]; then echo "ERROR: NO GATEWAY_NAME FOUND IN ENVIRONMENT" @@ -48,22 +44,16 @@ if [[ $GATEWAY_ALT == "" ]]; then fi echo GATEWAY_ALT: $GATEWAY_ALT -echo "**************************************************************" -echo "**************************************************************" +echo "******************" echo "" echo -e "{\n\t\"gateway_conf\": {\n\t\t\"gateway_ID\": \"0000000000000000\",\n\t\t\"servers\": [ { \"server_address\": \"croft.thethings.girovito.nl\", \"serv_port_up\": 1700, \"serv_port_down\": 1701, \"serv_enabled\": true } ],\n\t\t\"ref_latitude\": $GATEWAY_LAT,\n\t\t\"ref_longitude\": $GATEWAY_LON,\n\t\t\"ref_altitude\": $GATEWAY_ALT,\n\t\t\"contact_email\": \"$GATEWAY_EMAIL\",\n\t\t\"description\": \"$GATEWAY_NAME\" \n\t}\n}" >./local_conf.json # Reset gateway ID based on MAC + +echo "******************" ../packet_forwarder/reset_pkt_fwd.sh start ./local_conf.json - -# Display gateway ID, which is very important for debugging - -echo "**************************************************************" -echo "**************************************************************" -grep gateway_ID local_conf.json -echo "**************************************************************" -echo "**************************************************************" +echo "******************" echo "" # Test the connection, wait if needed. @@ -77,10 +67,8 @@ while true do echo "[TTN Gateway]: Starting packet forwarder..." ./poly_pkt_fwd - echo "**************************************************************" - echo "**************************************************************" - echo "[TTN Gateway]: Packet forwarder exited; retrying in 15s..." - echo "**************************************************************" - echo "**************************************************************" + echo "******************" + echo "*** [TTN Gateway]: Packet forwarder exited; retrying in 15s..." + echo "******************" sleep 15 done diff --git a/start.sh~ b/start.sh~ index b6fbd77..c07955f 100755 --- a/start.sh~ +++ b/start.sh~ @@ -1,8 +1,22 @@ #! /bin/bash +# Display the environment, which is useful when debugging + +echo "**************************************************************" +echo "**************************************************************" +echo "Environment:" +env +echo "**************************************************************" +echo "**************************************************************" +echo "" + # Configure the global and local configuration files via the environment -echo "Configuring gateway:" +echo "**************************************************************" +echo "**************************************************************" +echo "Gateway Configuration:" +echo "**************************************************************" +echo "**************************************************************" if [[ $GATEWAY_NAME == "" ]]; then echo "ERROR: NO GATEWAY_NAME FOUND IN ENVIRONMENT" @@ -34,6 +48,8 @@ if [[ $GATEWAY_ALT == "" ]]; then fi echo GATEWAY_ALT: $GATEWAY_ALT +echo "**************************************************************" +echo "**************************************************************" echo "" echo -e "{\n\t\"gateway_conf\": {\n\t\t\"gateway_ID\": \"0000000000000000\",\n\t\t\"servers\": [ { \"server_address\": \"croft.thethings.girovito.nl\", \"serv_port_up\": 1700, \"serv_port_down\": 1701, \"serv_enabled\": true } ],\n\t\t\"ref_latitude\": $GATEWAY_LAT,\n\t\t\"ref_longitude\": $GATEWAY_LON,\n\t\t\"ref_altitude\": $GATEWAY_ALT,\n\t\t\"contact_email\": \"$GATEWAY_EMAIL\",\n\t\t\"description\": \"$GATEWAY_NAME\" \n\t}\n}" >./local_conf.json @@ -41,6 +57,15 @@ echo -e "{\n\t\"gateway_conf\": {\n\t\t\"gateway_ID\": \"0000000000000000\",\n\t # Reset gateway ID based on MAC ../packet_forwarder/reset_pkt_fwd.sh start ./local_conf.json +# Display gateway ID, which is very important for debugging + +echo "**************************************************************" +echo "**************************************************************" +grep gateway_ID local_conf.json +echo "**************************************************************" +echo "**************************************************************" +echo "" + # Test the connection, wait if needed. while [[ $(ping -c1 google.com 2>&1 | grep " 0% packet loss") == "" ]]; do echo "[TTN Gateway]: Waiting for internet connection..." @@ -52,6 +77,10 @@ while true do echo "[TTN Gateway]: Starting packet forwarder..." ./poly_pkt_fwd + echo "**************************************************************" + echo "**************************************************************" echo "[TTN Gateway]: Packet forwarder exited; retrying in 15s..." + echo "**************************************************************" + echo "**************************************************************" sleep 15 done