Merge lp:~teknico/ubuntu-push/reflow-docs into lp:ubuntu-push

Proposed by Nicola Larosa
Status: Merged
Approved by: Samuele Pedroni
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
Reviewer Review Type Date Requested Status
Samuele Pedroni Approve
Review via email: mp+207694@code.launchpad.net

Commit message

Reflow comments so that subsequent changes are more readable. Only comment reflows, no other changes.

Description of the change

Reflow comments so that subsequent changes are more readable. Only comment reflows, no other changes.

To post a comment you must log in.
Revision history for this message
Samuele Pedroni (pedronis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 with this program. If not, see <http://www.gnu.org/licenses/>.
6 */
7
8-// Package connectivity a single, simple stream of booleans to answer
9-// the quesiton “are we connected?”.
10+// Package connectivity a single, simple stream of booleans
11+// to answer the quesiton “are we connected?”.
12 //
13 // It can potentially fire two falses in a row, if a disconnected
14 // state is followed by a dbus watch error. Other than that, it's edge
15@@ -32,8 +32,7 @@
16 "time"
17 )
18
19-// the configuration for ConnectedState, with the idea that you'd populate it
20-// from a config file.
21+// the configuration for ConnectedState, with the idea that you'd populate it from a config file.
22 type ConnectivityConfig struct {
23 // how long to wait after a state change to make sure it's "stable"
24 // before acting on it
25
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 "time"
31 )
32
33-// Protocol is a connection capable of writing and reading the wire format of protocol messages.
34+// Protocol is a connection capable of writing and reading the wire format
35+// of protocol messages.
36 type Protocol interface {
37 SetDeadline(t time.Time)
38 ReadMessage(msg interface{}) error
39@@ -71,7 +72,8 @@
40 }
41 }
42
43-// ReadMessage reads one message made of big endian uint16 length, JSON body of length from the connection.
44+// ReadMessage reads one message made of big endian uint16 length, JSON body
45+// of length from the connection.
46 func (c *protocol0) ReadMessage(msg interface{}) error {
47 c.buffer.Reset()
48 _, err := io.CopyN(c.buffer, c.conn, 2)
49@@ -87,7 +89,8 @@
50 return json.Unmarshal(c.buffer.Bytes(), msg)
51 }
52
53-// WriteMessage writes one message made of big endian uint16 length, JSON body of length to the connection.
54+// WriteMessage writes one message made of big endian uint16 length, JSON body
55+// of length to the connection.
56 func (c *protocol0) WriteMessage(msg interface{}) error {
57 c.buffer.Reset()
58 c.buffer.WriteString("\x00\x00") // placeholder for length
59
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 "launchpad.net/ubuntu-push/server/store"
65 )
66
67-// Broker is responsible for registring sessions and delivering messages through them.
68+// Broker is responsible for registring sessions and delivering messages
69+// through them.
70 type Broker interface {
71 // Register the session.
72 Register(*protocol.ConnectMsg) (BrokerSession, error)
73
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 "launchpad.net/ubuntu-push/server/store"
79 )
80
81-// SimpleBroker implements broker.Broker/BrokerSending for everything in just one process.
82+// SimpleBroker implements broker.Broker/BrokerSending for everything
83+// in just one process.
84 type SimpleBroker struct {
85 sto store.PendingStore
86 logger logger.Logger
87
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 with this program. If not, see <http://www.gnu.org/licenses/>.
93 */
94
95-// Package server contains code to start server components hosted by the subpackages.
96+// Package server contains code to start server components hosted
97+// by the subpackages.
98 package server
99
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 with this program. If not, see <http://www.gnu.org/licenses/>.
105 */
106
107-// Package listener has code to listen for device connections and setup sessions for them.
108+// Package listener has code to listen for device connections
109+// and setup sessions for them.
110 package listener
111
112 import (
113
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 helper *captureHelper
119 }
120
121-// NewTestLogger can be used in tests instead of NewSimpleLogger(FromMinimalLogger).
122+// NewTestLogger can be used in tests instead of
123+// NewSimpleLogger(FromMinimalLogger).
124 func NewTestLogger(minLog logger.MinimalLogger, level string) *TestLogger {
125 h := &captureHelper{outputFunc: minLog.Output}
126 log := &TestLogger{

Subscribers

People subscribed via source and target branches