Merge lp:~chipaca/ubuntu-push/nukexample into lp:ubuntu-push

[John Lenton]

nuked the connectivity example

Nuked the connectivity example; it was bitrotting, and no longer
served a purpose.

[Samuele Pedroni (pedronis)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The prerequisite https://code.launchpad.net/~chipaca/ubuntu-push/bus-endpoint-wachticker has not yet been merged into https://code.launchpad.net/~ubuntu-push-hackers/ubuntu-push/trunk.

Unmerged revisions

=== removed directory 'bus/connectivity/example'
=== removed file 'bus/connectivity/example/main.go'
--- bus/connectivity/example/main.go	2014-01-23 10:03:39 +0000
+++ bus/connectivity/example/main.go	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- 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/>.
-*/
-
-// a silly example of the connectivity api
-package main
-
-import (
-	"fmt"
-	"launchpad.net/ubuntu-push/bus"
-	"launchpad.net/ubuntu-push/bus/connectivity"
-	"launchpad.net/ubuntu-push/config"
-	"launchpad.net/ubuntu-push/logger"
-	"os"
-	"strings"
-)
-
-func main() {
-	log := logger.NewSimpleLogger(os.Stderr, "error")
-
-	paths := []string{"thing.json", "bus/connectivity/example/thing.json"}
-	for _, path := range paths {
-		cff, err := os.Open(path)
-		if err == nil {
-			var cfg connectivity.Config
-			err = config.ReadConfig(cff, &cfg)
-			if err != nil {
-				log.Fatalf("%s", err)
-			}
-
-			ch := make(chan bool)
-			go connectivity.ConnectedState(bus.SystemBus, cfg, log, ch)
-
-			for c := range ch {
-				fmt.Println("Are we connected?", c)
-			}
-			return
-		}
-	}
-	log.Fatalf("Unable to open the config file; tried %s.", strings.Join(paths, ", "))
-
-}

=== removed file 'bus/connectivity/example/thing.json'
--- bus/connectivity/example/thing.json	2014-01-20 06:27:39 +0000
+++ bus/connectivity/example/thing.json	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-{
-    "connectTimeouts": ["0s", "2s", "3s", "5s", "11s", "19s", "37s", "67s"],
-    "stabilizingTimeout": "2s",
-    "recheckTimeout": "10m",
-    "connectivityCheckURL": "http://start.ubuntu.com/connectivity-check.html",
-    "connectivityCheckMD5": "4589f42e1546aa47ca181e5d949d310b"
-}