Merge lp:~pedronis/ubuntu-push/log-debug-runtime-cfg into lp:ubuntu-push

[Samuele Pedroni]

log some debug info about runtime configuration of the dev server; also tweak play-around config.json with some slightly saner values

* log some debug info about runtime configuration of the dev server

* cd acceptance; ./acceptance.sh should keep working

* also tweak play-around config.json with some slightly saner values

[Simon Davy (bloodearnest)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~pedronis/ubuntu-push/log-debug-runtime-cfg into lp:ubuntu-push failed. Below is the output from the failed tests.

mkdir -p /mnt/tarmac/cache/ubuntu-push/go-ws/bin
mkdir -p /mnt/tarmac/cache/ubuntu-push/go-ws/pkg
go get -u launchpad.net/godeps
go get -d -u launchpad.net/gocheck
/mnt/tarmac/cache/ubuntu-push/go-ws/bin/godeps -u dependencies.tsv
go install launchpad.net/gocheck
go test launchpad.net/ubuntu-push/...
ok launchpad.net/ubuntu-push/config 0.010s
ok launchpad.net/ubuntu-push/logger 0.013s
ok launchpad.net/ubuntu-push/protocol 0.009s
ok launchpad.net/ubuntu-push/server/acceptance 0.007s
? launchpad.net/ubuntu-push/server/acceptance/cmd [no test files]
ok launchpad.net/ubuntu-push/server/api 0.013s
ok launchpad.net/ubuntu-push/server/broker 0.008s
ok launchpad.net/ubuntu-push/server/dev 0.009s
ok launchpad.net/ubuntu-push/server/listener 0.372s
ok launchpad.net/ubuntu-push/server/session 0.064s
ok launchpad.net/ubuntu-push/server/store 0.007s
? launchpad.net/ubuntu-push/testing [no test files]
ok launchpad.net/ubuntu-push/whoopsie/identifier 0.007s
ok launchpad.net/ubuntu-push/whoopsie/identifier/testing 0.008s
scripts/check_fmt launchpad.net/ubuntu-push
pkg launchpad.net/ubuntu-push/server/acceptance has some gofmt non-compliant files:
acceptance_test.go

make: *** [check-format] Error 1

[lp:~pedronis/ubuntu-push/log-debug-runtime-cfg]

11. By Samuele Pedroni on 2014-01-17

fix formatting

=== modified file 'server/acceptance/acceptance_test.go'
--- server/acceptance/acceptance_test.go	2014-01-15 15:54:20 +0000
+++ server/acceptance/acceptance_test.go	2014-01-17 18:29:39 +0000
@@ -96,6 +96,7 @@
 const (
 	devListeningOnPat  = "INFO listening for devices on "
 	httpListeningOnPat = "INFO listening for http on "
+	debugPrefix        = "DEBUG "
 )
 
 var rxLineInfo = regexp.MustCompile("^.*? ([[:alpha:]].*)\n")
@@ -132,24 +133,31 @@
 		c.Fatal(err)
 	}
 	bufErr := bufio.NewReaderSize(stderr, 5000)
-	getLineInfo := func() (string, error) {
-		line, err := bufErr.ReadString('\n')
-		if err != nil {
-			return "", err
-		}
-		extracted := rxLineInfo.FindStringSubmatch(line)
-		if extracted == nil {
-			return "", fmt.Errorf("unexpected server line: %#v", line)
-		}
-		return extracted[1], nil
+	getLineInfo := func(ignoreDebug bool) (string, error) {
+		for {
+			line, err := bufErr.ReadString('\n')
+			if err != nil {
+				return "", err
+			}
+			extracted := rxLineInfo.FindStringSubmatch(line)
+			if extracted == nil {
+				return "", fmt.Errorf("unexpected server line: %#v", line)
+			}
+			info := extracted[1]
+			if ignoreDebug && strings.HasPrefix(info, debugPrefix) {
+				// don't report DEBUG lines
+				continue
+			}
+			return info, nil
+		}
 	}
-	infoHTTP, err := getLineInfo()
+	infoHTTP, err := getLineInfo(true)
 	if err != nil {
 		c.Fatal(err)
 	}
 	serverHTTPAddr := extractListeningAddr(c, httpListeningOnPat, infoHTTP)
 	s.serverURL = fmt.Sprintf("http://%s", serverHTTPAddr)
-	info, err := getLineInfo()
+	info, err := getLineInfo(true)
 	if err != nil {
 		c.Fatal(err)
 	}
@@ -159,7 +167,7 @@
 	s.serverEvents = serverEvents
 	go func() {
 		for {
-			info, err := getLineInfo()
+			info, err := getLineInfo(false)
 			if err != nil {
 				serverEvents <- fmt.Sprintf("ERROR: %v", err)
 				close(serverEvents)
 
=== modified file 'server/acceptance/config/config.json'
--- server/acceptance/config/config.json	2014-01-14 15:35:20 +0000
+++ server/acceptance/config/config.json	2014-01-17 18:29:39 +0000
@@ -1,7 +1,7 @@
 {
-    "exchange_timeout": "0.5s",
-    "ping_interval": "2s",
-    "broker_queue_size": 100,
+    "exchange_timeout": "5s",
+    "ping_interval": "10s",
+    "broker_queue_size": 10000,
     "session_queue_size": 10,
     "addr": "127.0.0.1:9090",
     "key_pem_file": "testing.key",
 
=== modified file 'server/dev/server.go'
--- server/dev/server.go	2014-01-16 16:15:23 +0000
+++ server/dev/server.go	2014-01-17 18:29:39 +0000
@@ -27,6 +27,7 @@
 	"net"
 	"os"
 	"path/filepath"
+	"syscall"
 )
 
 func main() {
@@ -64,6 +65,13 @@
 		}
 	}()
 	// listen for device connections
+	logger.Debugf("PingInterval: %s, ExchangeTimeout %s", cfg.PingInterval(), cfg.ExchangeTimeout())
+	var rlim syscall.Rlimit
+	err = syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rlim)
+	if err != nil {
+		logger.Fatalf("getrlimit failed: %v", err)
+	}
+	logger.Debugf("nofile soft: %d hard: %d", rlim.Cur, rlim.Max)
 	lst, err := listener.DeviceListen(cfg)
 	if err != nil {
 		logger.Fatalf("start device listening: %v", err)