Merge lp:~pedronis/ubuntu-push/server-bits-in-server into lp:ubuntu-push

[Samuele Pedroni]

populate /server with the runners code; generalize acceptance.sh

* populate /server with the runners code

* generalize acceptance.sh

[John Lenton (chipaca)]

Easy peasy review. Good job.

review: Approve

=== modified file 'server/acceptance/acceptance.sh'
--- server/acceptance/acceptance.sh	2014-01-14 15:35:20 +0000
+++ server/acceptance/acceptance.sh	2014-01-24 07:55:11 +0000
@@ -1,6 +1,8 @@
 # run acceptance tests, expects properly setup GOPATH and deps
 # can set extra build params like -race with BUILD_FLAGS envvar
+# can set server pkg name with SERVER_PKG
 set -ex
-go test $BUILD_FLAGS -i
-go build $BUILD_FLAGS -o testserver launchpad.net/ubuntu-push/server/dev
-go test $BUILD_FLAGS -server ./testserver $*
+SERVER_PKG=${SERVER_PKG:-launchpad.net/ubuntu-push/server/dev}
+go test $BUILD_FLAGS -i launchpad.net/ubuntu-push/server/acceptance
+go build $BUILD_FLAGS -o testserver ${SERVER_PKG}
+go test $BUILD_FLAGS launchpad.net/ubuntu-push/server/acceptance -server ${PWD}/testserver $*

=== renamed file 'server/dev/bootlog.go' => 'server/bootlog.go'
--- server/dev/bootlog.go	2014-01-22 09:50:45 +0000
+++ server/bootlog.go	2014-01-24 07:55:11 +0000
@@ -14,7 +14,7 @@
  with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package main
+package server
 
 import (
 	"launchpad.net/ubuntu-push/logger"
@@ -29,7 +29,8 @@
 }
 
 var (
-	BootLogger      = logger.NewSimpleLogger(os.Stderr, "debug")
-	BootLogListener = bootLogListener
-	BootLogFatalf   = BootLogger.Fatalf
+	BootLogger = logger.NewSimpleLogger(os.Stderr, "debug")
+	// Boot logging helpers through BootLogger.
+	BootLogListener func(kind string, lst net.Listener) = bootLogListener
+	BootLogFatalf                                       = BootLogger.Fatalf
 )

=== renamed file 'server/dev/bootlog_test.go' => 'server/bootlog_test.go'
--- server/dev/bootlog_test.go	2014-01-22 09:50:45 +0000
+++ server/bootlog_test.go	2014-01-24 07:55:11 +0000
@@ -14,7 +14,7 @@
  with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package main
+package server
 
 import (
 	"bytes"

=== renamed file 'server/dev/config_test.go' => 'server/config_test.go'
--- server/dev/config_test.go	2014-01-22 09:50:45 +0000
+++ server/config_test.go	2014-01-24 07:55:11 +0000
@@ -14,7 +14,7 @@
  with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package main
+package server
 
 import (
 	"bytes"

=== modified file 'server/dev/server.go'
--- server/dev/server.go	2014-01-22 09:50:45 +0000
+++ server/dev/server.go	2014-01-24 07:55:11 +0000
@@ -20,6 +20,7 @@
 import (
 	"launchpad.net/ubuntu-push/config"
 	"launchpad.net/ubuntu-push/logger"
+	"launchpad.net/ubuntu-push/server"
 	"launchpad.net/ubuntu-push/server/api"
 	"launchpad.net/ubuntu-push/server/broker"
 	"launchpad.net/ubuntu-push/server/session"
@@ -31,9 +32,9 @@
 
 type configuration struct {
 	// device server configuration
-	DevicesParsedConfig
+	server.DevicesParsedConfig
 	// api http server configuration
-	HTTPServeParsedConfig
+	server.HTTPServeParsedConfig
 }
 
 func main() {
@@ -41,11 +42,11 @@
 	cfg := &configuration{}
 	err := config.ReadFiles(cfg, cfgFpaths...)
 	if err != nil {
-		BootLogFatalf("reading config: %v", err)
+		server.BootLogFatalf("reading config: %v", err)
 	}
 	err = cfg.DevicesParsedConfig.FinishLoad(filepath.Dir(cfgFpaths[len(cfgFpaths)-1]))
 	if err != nil {
-		BootLogFatalf("reading config: %v", err)
+		server.BootLogFatalf("reading config: %v", err)
 	}
 	logger := logger.NewSimpleLogger(os.Stderr, "debug")
 	// setup a pending store and start the broker
@@ -56,9 +57,9 @@
 	// serve the http api
 	handler := api.MakeHandlersMux(sto, broker, logger)
 	handler = api.PanicTo500Handler(handler, logger)
-	go HTTPServeRunner(handler, &cfg.HTTPServeParsedConfig)()
+	go server.HTTPServeRunner(handler, &cfg.HTTPServeParsedConfig)()
 	// listen for device connections
-	DevicesRunner(func(conn net.Conn) error {
+	server.DevicesRunner(func(conn net.Conn) error {
 		track := session.NewTracker(logger)
 		return session.Session(conn, broker, cfg, track)
 	}, logger, &cfg.DevicesParsedConfig)()

=== added file 'server/doc.go'
--- server/doc.go	1970-01-01 00:00:00 +0000
+++ server/doc.go	2014-01-24 07:55:11 +0000
@@ -0,0 +1,18 @@
+/*
+ Copyright 2013-2014 Canonical Ltd.
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// Package server contains code to start server components hosted by the subpackages.
+package server

=== renamed file 'server/dev/runner_devices.go' => 'server/runner_devices.go'
--- server/dev/runner_devices.go	2014-01-22 09:50:45 +0000
+++ server/runner_devices.go	2014-01-24 07:55:11 +0000
@@ -14,7 +14,7 @@
  with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package main
+package server
 
 import (
 	"fmt"
@@ -85,7 +85,7 @@
 	return cfg.certPEMBlock
 }
 
-// RunDevices listens for device connections.
+// DevicesRunner returns a function to accept device connections.
 func DevicesRunner(session func(net.Conn) error, logger logger.Logger, parsedCfg *DevicesParsedConfig) func() {
 	BootLogger.Debugf("PingInterval: %s, ExchangeTimeout %s", parsedCfg.PingInterval(), parsedCfg.ExchangeTimeout())
 	var rlim syscall.Rlimit

=== renamed file 'server/dev/runner_http.go' => 'server/runner_http.go'
--- server/dev/runner_http.go	2014-01-22 09:50:45 +0000
+++ server/runner_http.go	2014-01-24 07:55:11 +0000
@@ -14,7 +14,7 @@
  with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package main
+package server
 
 import (
 	"launchpad.net/ubuntu-push/config"

=== renamed file 'server/dev/runner_test.go' => 'server/runner_test.go'
--- server/dev/runner_test.go	2014-01-22 09:50:45 +0000
+++ server/runner_test.go	2014-01-24 07:55:11 +0000
@@ -14,7 +14,7 @@
  with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package main
+package server
 
 import (
 	"bytes"