1
=== modified file 'bus/connectivity/connectivity.go'
2
--- bus/connectivity/connectivity.go	2014-02-06 07:59:27 +0000
3
+++ bus/connectivity/connectivity.go	2014-02-21 16:21:03 +0000
4
@@ -14,8 +14,8 @@
5
14
 with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 with this program.  If not, see <http://www.gnu.org/licenses/>.
6
15
*/
15
*/
7
16
16
10
17
// Package connectivity a single, simple stream of booleans to answer
17
// Package connectivity a single, simple stream of booleans
11
18
// the quesiton “are we connected?”.
18
// to answer the quesiton “are we connected?”.
12
19
//
19
//
13
20
// It can potentially fire two falses in a row, if a disconnected
20
// It can potentially fire two falses in a row, if a disconnected
14
21
// state is followed by a dbus watch error. Other than that, it's edge
21
// state is followed by a dbus watch error. Other than that, it's edge
15
@@ -32,8 +32,7 @@
16
32
	"time"
32
	"time"
17
33
)
33
)
18
34
34
21
35
// the configuration for ConnectedState, with the idea that you'd populate it
35
// the configuration for ConnectedState, with the idea that you'd populate it from a config file.
20
36
// from a config file.
22
37
type ConnectivityConfig struct {
36
type ConnectivityConfig struct {
23
38
	// how long to wait after a state change to make sure it's "stable"
37
	// how long to wait after a state change to make sure it's "stable"
24
39
	// before acting on it
38
	// before acting on it
25
40
39
26
=== modified file 'protocol/protocol.go'
27
--- protocol/protocol.go	2014-01-28 22:18:39 +0000
28
+++ protocol/protocol.go	2014-02-21 16:21:03 +0000
29
@@ -27,7 +27,8 @@
30
27
	"time"
27
	"time"
31
28
)
28
)
32
29
29
34
30
// Protocol is a connection capable of writing and reading the wire format of protocol messages.
30
// Protocol is a connection capable of writing and reading the wire format
35
31
// of protocol messages.
36
31
type Protocol interface {
32
type Protocol interface {
37
32
	SetDeadline(t time.Time)
33
	SetDeadline(t time.Time)
38
33
	ReadMessage(msg interface{}) error
34
	ReadMessage(msg interface{}) error
39
@@ -71,7 +72,8 @@
40
71
	}
72
	}
41
72
}
73
}
42
73
74
44
74
// ReadMessage reads one message made of big endian uint16 length, JSON body of length from the connection.
75
// ReadMessage reads one message made of big endian uint16 length, JSON body
45
76
// of length from the connection.
46
75
func (c *protocol0) ReadMessage(msg interface{}) error {
77
func (c *protocol0) ReadMessage(msg interface{}) error {
47
76
	c.buffer.Reset()
78
	c.buffer.Reset()
48
77
	_, err := io.CopyN(c.buffer, c.conn, 2)
79
	_, err := io.CopyN(c.buffer, c.conn, 2)
49
@@ -87,7 +89,8 @@
50
87
	return json.Unmarshal(c.buffer.Bytes(), msg)
89
	return json.Unmarshal(c.buffer.Bytes(), msg)
51
88
}
90
}
52
89
91
54
90
// WriteMessage writes one message made of big endian uint16 length, JSON body of length to the connection.
92
// WriteMessage writes one message made of big endian uint16 length, JSON body
55
93
// of length to the connection.
56
91
func (c *protocol0) WriteMessage(msg interface{}) error {
94
func (c *protocol0) WriteMessage(msg interface{}) error {
57
92
	c.buffer.Reset()
95
	c.buffer.Reset()
58
93
	c.buffer.WriteString("\x00\x00") // placeholder for length
96
	c.buffer.WriteString("\x00\x00") // placeholder for length
59
94
97
60
=== modified file 'server/broker/broker.go'
61
--- server/broker/broker.go	2014-02-10 23:19:08 +0000
62
+++ server/broker/broker.go	2014-02-21 16:21:03 +0000
63
@@ -25,7 +25,8 @@
64
25
	"launchpad.net/ubuntu-push/server/store"
25
	"launchpad.net/ubuntu-push/server/store"
65
26
)
26
)
66
27
27
68
28
// Broker is responsible for registring sessions and delivering messages through them.
28
// Broker is responsible for registring sessions and delivering messages
69
29
// through them.
70
29
type Broker interface {
30
type Broker interface {
71
30
	// Register the session.
31
	// Register the session.
72
31
	Register(*protocol.ConnectMsg) (BrokerSession, error)
32
	Register(*protocol.ConnectMsg) (BrokerSession, error)
73
32
33
74
=== modified file 'server/broker/simple/simple.go'
75
--- server/broker/simple/simple.go	2014-02-10 23:19:08 +0000
76
+++ server/broker/simple/simple.go	2014-02-21 16:21:03 +0000
77
@@ -26,7 +26,8 @@
78
26
	"launchpad.net/ubuntu-push/server/store"
26
	"launchpad.net/ubuntu-push/server/store"
79
27
)
27
)
80
28
28
82
29
// SimpleBroker implements broker.Broker/BrokerSending for everything in just one process.
29
// SimpleBroker implements broker.Broker/BrokerSending for everything
83
30
// in just one process.
84
30
type SimpleBroker struct {
31
type SimpleBroker struct {
85
31
	sto    store.PendingStore
32
	sto    store.PendingStore
86
32
	logger logger.Logger
33
	logger logger.Logger
87
33
34
88
=== modified file 'server/doc.go'
89
--- server/doc.go	2014-01-23 15:33:30 +0000
90
+++ server/doc.go	2014-02-21 16:21:03 +0000
91
@@ -14,5 +14,6 @@
92
14
 with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 with this program.  If not, see <http://www.gnu.org/licenses/>.
93
15
*/
15
*/
94
16
16
96
17
// Package server contains code to start server components hosted by the subpackages.
17
// Package server contains code to start server components hosted
97
18
// by the subpackages.
98
18
package server
19
package server
99
19
20
100
=== modified file 'server/listener/listener.go'
101
--- server/listener/listener.go	2014-02-10 23:19:08 +0000
102
+++ server/listener/listener.go	2014-02-21 16:21:03 +0000
103
@@ -14,7 +14,8 @@
104
14
 with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 with this program.  If not, see <http://www.gnu.org/licenses/>.
105
15
*/
15
*/
106
16
16
108
17
// Package listener has code to listen for device connections and setup sessions for them.
17
// Package listener has code to listen for device connections
109
18
// and setup sessions for them.
110
18
package listener
19
package listener
111
19
20
112
20
import (
21
import (
113
21
22
114
=== modified file 'testing/helpers.go'
115
--- testing/helpers.go	2014-02-10 23:32:48 +0000
116
+++ testing/helpers.go	2014-02-21 16:21:03 +0000
117
@@ -73,7 +73,8 @@
118
73
	helper *captureHelper
73
	helper *captureHelper
119
74
}
74
}
120
75
75
122
76
// NewTestLogger can be used in tests instead of NewSimpleLogger(FromMinimalLogger).
76
// NewTestLogger can be used in tests instead of
123
77
// NewSimpleLogger(FromMinimalLogger).
124
77
func NewTestLogger(minLog logger.MinimalLogger, level string) *TestLogger {
78
func NewTestLogger(minLog logger.MinimalLogger, level string) *TestLogger {
125
78
	h := &captureHelper{outputFunc: minLog.Output}
79
	h := &captureHelper{outputFunc: minLog.Output}
126
79
	log := &TestLogger{
80
	log := &TestLogger{
Status:	Merged
Approved by:	Samuele Pedroni on 2014-02-24
Approved revision:	71
Merged at revision:	72
Proposed branch:	lp:~teknico/ubuntu-push/reflow-docs
Merge into:	lp:ubuntu-push
Diff against target:	126 lines (+19/-12) 7 files modified bus/connectivity/connectivity.go (+3/-4) protocol/protocol.go (+6/-3) server/broker/broker.go (+2/-1) server/broker/simple/simple.go (+2/-1) server/doc.go (+2/-1) server/listener/listener.go (+2/-1) testing/helpers.go (+2/-1)
To merge this branch:	bzr merge lp:~teknico/ubuntu-push/reflow-docs
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Samuele Pedroni		2014-02-21	Approve on 2014-02-24
Review via email: mp+207694@code.launchpad.net