[Python-checkins] bpo-37331: Clarify format of socket handler messages in the documentation. (GH-14234)
Vinay Sajip
webhook-mailer at python.org
Wed Jun 19 10:30:23 EDT 2019
https://github.com/python/cpython/commit/f06b569305cf604f070776ea3f800ed61fdd7d61
commit: f06b569305cf604f070776ea3f800ed61fdd7d61
branch: master
author: Vinay Sajip <vinay_sajip at yahoo.co.uk>
committer: GitHub <noreply at github.com>
date: 2019-06-19T15:29:57+01:00
summary:
bpo-37331: Clarify format of socket handler messages in the documentation. (GH-14234)
files:
M Doc/library/logging.handlers.rst
diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index 822f82dffcfd..21c6a045de06 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -488,7 +488,12 @@ sends logging output to a network socket. The base class uses a TCP socket.
.. method:: makePickle(record)
Pickles the record's attribute dictionary in binary format with a length
- prefix, and returns it ready for transmission across the socket.
+ prefix, and returns it ready for transmission across the socket. The
+ details of this operation are equivalent to::
+
+ data = pickle.dumps(record_attr_dict, 1)
+ datalen = struct.pack('>L', len(data))
+ return datalen + data
Note that pickles aren't completely secure. If you are concerned about
security, you may want to override this method to implement a more secure
@@ -499,8 +504,12 @@ sends logging output to a network socket. The base class uses a TCP socket.
.. method:: send(packet)
- Send a pickled string *packet* to the socket. This function allows for
- partial sends which can happen when the network is busy.
+ Send a pickled byte-string *packet* to the socket. The format of the sent
+ byte-string is as described in the documentation for
+ :meth:`~SocketHandler.makePickle`.
+
+ This function allows for partial sends, which can happen when the network
+ is busy.
.. method:: createSocket()
@@ -561,7 +570,8 @@ over UDP sockets.
.. method:: send(s)
- Send a pickled string to a socket.
+ Send a pickled byte-string to a socket. The format of the sent byte-string
+ is as described in the documentation for :meth:`SocketHandler.makePickle`.
.. _syslog-handler:
More information about the Python-checkins
mailing list