1
=== modified file 'protocol/messages.go'
2
--- protocol/messages.go	2014-02-24 15:55:53 +0000
3
+++ protocol/messages.go	2014-02-24 15:55:53 +0000
4
@@ -16,7 +16,7 @@
5
16
16
6
17
package protocol
17
package protocol
7
18
18
9
19
// Struct representing messages.
19
// Structs representing messages.
10
20
20
11
21
import (
21
import (
12
22
	"encoding/json"
22
	"encoding/json"
13
23
23
14
=== modified file 'protocol/protocol.go'
15
--- protocol/protocol.go	2014-02-24 15:55:53 +0000
16
+++ protocol/protocol.go	2014-02-24 15:55:53 +0000
17
@@ -64,7 +64,7 @@
18
64
		conn:   conn}
64
		conn:   conn}
19
65
}
65
}
20
66
66
22
67
// SetDeadline sets deadline for the subsequent WriteMessage/ReadMessage exchange.
67
// SetDeadline sets the deadline for the subsequent WriteMessage/ReadMessage exchange.
23
68
func (c *protocol0) SetDeadline(t time.Time) {
68
func (c *protocol0) SetDeadline(t time.Time) {
24
69
	err := c.conn.SetDeadline(t)
69
	err := c.conn.SetDeadline(t)
25
70
	if err != nil {
70
	if err != nil {
26
@@ -72,8 +72,8 @@
27
72
	}
72
	}
28
73
}
73
}
29
74
74
32
75
// ReadMessage reads one message with big-endian uint16 length and JSON body
75
// ReadMessage reads from the connection one message with a JSON body
33
76
// from the connection.
76
// preceded by its big-endian uint16 length.
34
77
func (c *protocol0) ReadMessage(msg interface{}) error {
77
func (c *protocol0) ReadMessage(msg interface{}) error {
35
78
	c.buffer.Reset()
78
	c.buffer.Reset()
36
79
	_, err := io.CopyN(c.buffer, c.conn, 2)
79
	_, err := io.CopyN(c.buffer, c.conn, 2)
37
@@ -89,8 +89,8 @@
38
89
	return json.Unmarshal(c.buffer.Bytes(), msg)
89
	return json.Unmarshal(c.buffer.Bytes(), msg)
39
90
}
90
}
40
91
91
43
92
// WriteMessage writes one message with big-endian uint16 length and JSON body
92
// WriteMessage writes one message to the connection with a JSON body
44
93
// to the connection.
93
// preceding it with its big-endian uint16 length.
45
94
func (c *protocol0) WriteMessage(msg interface{}) error {
94
func (c *protocol0) WriteMessage(msg interface{}) error {
46
95
	c.buffer.Reset()
95
	c.buffer.Reset()
47
96
	c.buffer.WriteString("\x00\x00") // placeholder for length
96
	c.buffer.WriteString("\x00\x00") // placeholder for length
48
97
97
49
=== modified file 'server/dev/server.go'
50
--- server/dev/server.go	2014-02-24 15:55:53 +0000
51
+++ server/dev/server.go	2014-02-24 15:55:53 +0000
52
@@ -14,7 +14,7 @@
53
14
 with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 with this program.  If not, see <http://www.gnu.org/licenses/>.
54
15
*/
15
*/
55
16
16
57
17
// Server is a simple development server.
17
// Dev is a simple development server.
58
18
package main
18
package main
59
19
19
60
20
import (
20
import (
Status:	Merged
Approved by:	Samuele Pedroni on 2014-02-24
Approved revision:	74
Merged at revision:	74
Proposed branch:	lp:~pedronis/ubuntu-push/tweak-docs
Merge into:	lp:ubuntu-push
Prerequisite:	lp:~teknico/ubuntu-push/tweak-docs
Diff against target:	60 lines (+7/-7) 3 files modified protocol/messages.go (+1/-1) protocol/protocol.go (+5/-5) server/dev/server.go (+1/-1)
To merge this branch:	bzr merge lp:~pedronis/ubuntu-push/tweak-docs
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Samuele Pedroni			Approve on 2014-02-24
Review via email: mp+207959@code.launchpad.net
1	=== modified file 'protocol/messages.go'
2	--- protocol/messages.go 2014-02-24 15:55:53 +0000
3	+++ protocol/messages.go 2014-02-24 15:55:53 +0000
4	@@ -16,7 +16,7 @@
5	16		16
6	17	package protocol	17	package protocol
7	18		18
9	19	// Struct representing messages.	19	// Structs representing messages.
10	20		20
11	21	import (	21	import (
12	22	"encoding/json"	22	"encoding/json"
13	23		23
14	=== modified file 'protocol/protocol.go'
15	--- protocol/protocol.go 2014-02-24 15:55:53 +0000
16	+++ protocol/protocol.go 2014-02-24 15:55:53 +0000
17	@@ -64,7 +64,7 @@
18	64	conn: conn}	64	conn: conn}
19	65	}	65	}
20	66		66
22	67	// SetDeadline sets deadline for the subsequent WriteMessage/ReadMessage exchange.	67	// SetDeadline sets the deadline for the subsequent WriteMessage/ReadMessage exchange.
23	68	func (c *protocol0) SetDeadline(t time.Time) {	68	func (c *protocol0) SetDeadline(t time.Time) {
24	69	err := c.conn.SetDeadline(t)	69	err := c.conn.SetDeadline(t)
25	70	if err != nil {	70	if err != nil {
26	@@ -72,8 +72,8 @@
27	72	}	72	}
28	73	}	73	}
29	74		74
32	75	// ReadMessage reads one message with big-endian uint16 length and JSON body	75	// ReadMessage reads from the connection one message with a JSON body
33	76	// from the connection.	76	// preceded by its big-endian uint16 length.
34	77	func (c *protocol0) ReadMessage(msg interface{}) error {	77	func (c *protocol0) ReadMessage(msg interface{}) error {
35	78	c.buffer.Reset()	78	c.buffer.Reset()
36	79	_, err := io.CopyN(c.buffer, c.conn, 2)	79	_, err := io.CopyN(c.buffer, c.conn, 2)
37	@@ -89,8 +89,8 @@
38	89	return json.Unmarshal(c.buffer.Bytes(), msg)	89	return json.Unmarshal(c.buffer.Bytes(), msg)
39	90	}	90	}
40	91		91
43	92	// WriteMessage writes one message with big-endian uint16 length and JSON body	92	// WriteMessage writes one message to the connection with a JSON body
44	93	// to the connection.	93	// preceding it with its big-endian uint16 length.
45	94	func (c *protocol0) WriteMessage(msg interface{}) error {	94	func (c *protocol0) WriteMessage(msg interface{}) error {
46	95	c.buffer.Reset()	95	c.buffer.Reset()
47	96	c.buffer.WriteString("\x00\x00") // placeholder for length	96	c.buffer.WriteString("\x00\x00") // placeholder for length
48	97		97
49	=== modified file 'server/dev/server.go'
50	--- server/dev/server.go 2014-02-24 15:55:53 +0000
51	+++ server/dev/server.go 2014-02-24 15:55:53 +0000
52	@@ -14,7 +14,7 @@
53	14	with this program. If not, see <http://www.gnu.org/licenses/>.	14	with this program. If not, see <http://www.gnu.org/licenses/>.
54	15	*/	15	*/
55	16		16
57	17	// Server is a simple development server.	17	// Dev is a simple development server.
58	18	package main	18	package main
59	19		19
60	20	import (	20	import (