Commit 6f0929b0 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent ac793829
...@@ -305,7 +305,7 @@ func (r rpc) ereplyf(format string, argv ...interface{}) *errorUnexpectedReply { ...@@ -305,7 +305,7 @@ func (r rpc) ereplyf(format string, argv ...interface{}) *errorUnexpectedReply {
func openByURL(ctx context.Context, u *url.URL, opt *zodb.DriverOptions) (_ zodb.IStorageDriver, at0 zodb.Tid, err error) { func openByURL(ctx context.Context, u *url.URL, opt *zodb.DriverOptions) (_ zodb.IStorageDriver, at0 zodb.Tid, err error) {
url := u.String() url := u.String()
defer xerr.Contextf(&err, "open %s:", url) defer xerr.Contextf(&err, "open %s", url)
// zeo://host:port/path?storage=...&... // zeo://host:port/path?storage=...&...
var net xnet.Networker var net xnet.Networker
......
...@@ -290,7 +290,7 @@ func pktEncodeZ(m msg) *pktBuf { ...@@ -290,7 +290,7 @@ func pktEncodeZ(m msg) *pktBuf {
// pktEncodeM encodes message into raw M (msgpack) packet. // pktEncodeM encodes message into raw M (msgpack) packet.
func pktEncodeM(m msg) *pktBuf { func pktEncodeM(m msg) *pktBuf {
pkb := allocPkb() pkb := allocPkb()
data, err := msgpack.EncodeStructAsArray(m) data, err := msgpack.Encode(tuple{m.msgid, m.flags, m.method, m.arg})
if err != nil { if err != nil {
panic(err) // all our types are expected to be supported by msgpack panic(err) // all our types are expected to be supported by msgpack
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment