Add a bunch of debug stuff

Author: JimNasbyGE

client/client.go

@@ -142,6 +142,7 @@ func (c *Client) start() {
 		}
 		if connerr != nil {
 			d := b.Duration()
+			c.Debugf("Error connecting: %s", connerr)
 			c.Infof("Retrying in %s...\n", d)
 			connerr = nil
 			time.Sleep(d)

deploy.sh

@@ -2,6 +2,9 @@
 # Stop processing on error
 set -e
 
+echo Current environment
+env
+
 echo Configuring container
 mkdir -p etc var/run
 
@@ -45,5 +48,5 @@ $(pwd)/openssh-portable/sshd -f etc/sshd_config
 # echo "$PASS" | passwd 
 
 # Start the webserver immediately; this prevents Cloud Foundry from killing this container
-./bin/chisel server --proxy http://example.com --port $PORT
+./bin/chisel server -v --port $PORT $SERVER_ARGS
 

push.sh

@@ -5,6 +5,15 @@ set -e # exit on error
 cd `dirname $0`
 source .default.sh
 
+# Always start a build
+GOPATH=$(cd ../../../..;pwd) go build &
+
+# Were we called by ./tunnel?
+if [ "$1" == -t ]; then
+  tunnel=yes
+  shift
+fi
+
 # See if we're already running...
 echo "Checking if $CHISEL_APP_NAME is running"
 set +e
@@ -33,6 +42,7 @@ if [ $rc -ne 0 ]; then
 else
   if echo "$out" | grep -q running; then
     echo "$CHISEL_APP_NAME is running; skipping push."
+    wait # Make sure build is done
     exit
   fi
 fi
@@ -66,12 +76,11 @@ fi
 
 echo "pushing $CHISEL_APP_NAME to cloud foundry"
 
-cf push -t 180 $@ "$CHISEL_APP_NAME" & # -t: maximum number of seconds to wait for app to start
-
-GOPATH=$(cd ../../../..;pwd) go build
+cf push -t 180 $@ "$CHISEL_APP_NAME" # -t: maximum number of seconds to wait for app to start
 
 wait
 
-./tunnel
+# If we weren't started by tunnel, run ./tunnel
+[ -n "$tunnel" ] || ./tunnel
 
 # vi: expandtab sw=2 ts=2

server/server.go

@@ -97,6 +97,7 @@ func (s *Server) Run(host, port string) error {
 }
 
 func (s *Server) Start(host, port string) error {
+	s.Debugf("Debug enabled")
 	s.Infof("Fingerprint %s", s.fingerprint)
 	if len(s.Users) > 0 {
 		s.Infof("User authenication enabled")

tunnel

@@ -39,7 +39,7 @@ esac
 echo "Starting $CHISEL_APP_NAME forwarding local port $CHISEL_LOCAL_PORT to remote port $CHISEL_REMOTE_PORT"
 
 # Make sure that app is running
-./push.sh $@
+./push.sh -t $@
 
 echo "Obtaining url for $CHISEL_APP_NAME"
 url=`cf app $CHISEL_APP_NAME | egrep 'routes|urls' | awk '{print $2}'`