proxy: use default block g1

Author: xcolwell

model/network_client_proxy_model.go

@@ -496,7 +496,7 @@ func CreateProxyClient(
 		wgPort := 8084
 
 		proxyHost := fmt.Sprintf("%s.%s", "cosmic", server.RequireDomain())
-		block := ""
+		block := "g1"
 
 		socksProxyUrl := fmt.Sprintf("socks5h://%s:%d", proxyHost, socksProxyPort)
 

proxy/main.go

@@ -131,7 +131,9 @@ func main() {
 		settings,
 	)
 
-	newWatchdog(ctx, 5*time.Second)
+	if server.RequireEnv() != "local" {
+		newWatchdog(ctx, 5*time.Second)
+	}
 
 	notif := newProxyClientNotification(ctx, settings)
 	sub := notif.AddProxyClientsCallback(func(proxyClients []*model.ProxyClient) {

proxy/proxy_client_notification.go

@@ -34,8 +34,7 @@ func newProxyClientNotification(ctx context.Context, settings *ProxySettings) *p
 
 func (self *proxyClientNotification) run() {
 	proxyHost := server.RequireHost()
-	// FIXME allow an optional block until migration is complete
-	block, _ := server.Block()
+	block := server.RequireBlock()
 
 	nextChangeId := int64(0)
 	for {
@@ -50,6 +49,8 @@ func (self *proxyClientNotification) run() {
 		if err != nil {
 			glog.Infof("[pcn]err=%s\n", err)
 		} else if 0 < len(proxyClients) {
+
+			glog.Infof("[pcn]found %d new proxy clients (...%d)\n", len(proxyClients), nextChangeId)
 			self.proxyClients(maps.Values(proxyClients))
 		}
 		select {

proxy/run-builder.sh

@@ -2,13 +2,16 @@
 
 env=main
 
-export GOEXPERIMENT=greenteagc
-export WARP_DOMAIN="bringyour.com"
-export WARP_SERVICE="proxy"
-export WARP_VERSION="0.0.0-local"
-export WARP_ENV="$env"
-export BRINGYOUR_POSTGRES_HOSTNAME="192.168.51.43"
-export BRINGYOUR_REDIS_HOSTNAME="192.168.51.43"
+export GOEXPERIMENT=greenteagc;
+export WARP_DOMAIN="bringyour.com";
+export WARP_SERVICE="proxy";
+export WARP_VERSION="0.0.0-local";
+export WARP_ENV="$env";
+# FIXME this is temporary until the final deploy is worked out
+export WARP_HOST="cosmic.bringyour.com";
+export WARP_BLOCK="g1";
+export BRINGYOUR_POSTGRES_HOSTNAME="192.168.51.43";
+export BRINGYOUR_REDIS_HOSTNAME="192.168.51.43";
 while [ 1 ]; do
 	go run . "$@"
 done

proxy/run-local.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+export WARP_DOMAIN="bringyour.com";
+export WARP_HOST="127.0.0.1";
+export WARP_BLOCK="local";
+export WARP_SERVICE="proxy";
+export WARP_VERSION="0.0.0-local";
+export WARP_ENV="local";
+# FIXME this is temporary until the final deploy is worked out
+export WARP_HOST="cosmic.bringyour.com"
+export BRINGYOUR_POSTGRES_HOSTNAME="local-pg.bringyour.com";
+export BRINGYOUR_REDIS_HOSTNAME="local-redis.bringyour.com";
+go run . "$@"

proxy/run-main.sh

@@ -5,10 +5,13 @@ env=main
 # you must port forward to the main db and redis from 127.0.0.1
 # e.g. ssh -i ${main-data-key} -L 5432:127.0.0.1:5432 -L 6379:127.0.0.1:6379 by@${main-data-host} -N
 
-export WARP_DOMAIN="bringyour.com"; \
-export WARP_SERVICE="proxy"; \
-export WARP_VERSION="0.0.0-local"; \
-export WARP_ENV="$env"; \
-export BRINGYOUR_POSTGRES_HOSTNAME="127.0.0.1"; \
-export BRINGYOUR_REDIS_HOSTNAME="127.0.0.1"; \
+export WARP_DOMAIN="bringyour.com";
+export WARP_SERVICE="proxy";
+export WARP_VERSION="0.0.0-local";
+export WARP_ENV="$env";
+# FIXME this is temporary until the final deploy is worked out
+export WARP_HOST="cosmic.bringyour.com";
+export WARP_BLOCK="g1";
+export BRINGYOUR_POSTGRES_HOSTNAME="127.0.0.1";
+export BRINGYOUR_REDIS_HOSTNAME="127.0.0.1";
 go run . "$@"