[Python-modules-commits] [partd] 01/03: Import partd_0.3.7.orig.tar.gz
Diane Trout
diane at moszumanska.debian.org
Thu Jan 5 19:07:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
diane pushed a commit to branch master
in repository partd.
commit f348d340d236475bc46c159a5696cb0d4f2fa125
Author: Diane Trout <diane at ghic.org>
Date: Thu Jan 5 10:55:17 2017 -0800
Import partd_0.3.7.orig.tar.gz
---
PKG-INFO | 2 +-
partd.egg-info/PKG-INFO | 2 +-
partd/__init__.py | 2 +-
partd/tests/test_zmq.py | 2 +-
partd/zmq.py | 60 +++++++++++++++++--------------------------------
setup.py | 2 +-
6 files changed, 26 insertions(+), 44 deletions(-)
diff --git a/PKG-INFO b/PKG-INFO
index 9aa4ae5..ffc22f6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: partd
-Version: 0.3.6
+Version: 0.3.7
Summary: Appendable key-value storage
Home-page: http://github.com/dask/partd/
Author: Matthew Rocklin
diff --git a/partd.egg-info/PKG-INFO b/partd.egg-info/PKG-INFO
index 9aa4ae5..ffc22f6 100644
--- a/partd.egg-info/PKG-INFO
+++ b/partd.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: partd
-Version: 0.3.6
+Version: 0.3.7
Summary: Appendable key-value storage
Home-page: http://github.com/dask/partd/
Author: Matthew Rocklin
diff --git a/partd/__init__.py b/partd/__init__.py
index c14f6d7..bb7ccd8 100644
--- a/partd/__init__.py
+++ b/partd/__init__.py
@@ -16,4 +16,4 @@ with ignoring(ImportError):
from .zmq import Client, Server
-__version__ = '0.3.6'
+__version__ = '0.3.7'
diff --git a/partd/tests/test_zmq.py b/partd/tests/test_zmq.py
index 15827da..4c492d6 100644
--- a/partd/tests/test_zmq.py
+++ b/partd/tests/test_zmq.py
@@ -1,7 +1,7 @@
import pytest
pytest.importorskip('zmq')
-from partd.zmq import Server, keys_to_flush, log, File, Client
+from partd.zmq import Server, keys_to_flush, File, Client
from partd import core, Dict
from threading import Thread
from time import sleep
diff --git a/partd/zmq.py b/partd/zmq.py
index 83b237e..3502680 100644
--- a/partd/zmq.py
+++ b/partd/zmq.py
@@ -1,6 +1,7 @@
from __future__ import absolute_import, print_function
import zmq
+import logging
from itertools import chain
from bisect import bisect
import socket
@@ -25,34 +26,15 @@ from .utils import ignoring
tuple_sep = b'-|-'
-def log(*args):
- with open('log', 'a') as f:
- print(datetime.now(), *args, file=f)
+logger = logging.getLogger(__name__)
-log('Import zmq')
-
- at contextmanager
-def logduration(message, nbytes=None):
- start = time()
- try:
- yield
- finally:
- end = time()
- log(message, end - start)
- if nbytes:
- log("MB/s:", nbytes / (end - start) / 1e6)
-
@contextmanager
def logerrors():
try:
yield
except Exception as e:
- log('Error!', str(e))
- exc_type, exc_value, exc_traceback = sys.exc_info()
- tb = ''.join(traceback.format_tb(exc_traceback))
- log('Error!', str(e))
- log('Traceback', str(tb))
+ logger.exception(e)
raise
@@ -94,7 +76,7 @@ class Server(object):
self.status = 'run'
self._listen_thread = Thread(target=self.listen)
self._listen_thread.start()
- log('Start server at', self.address)
+ logger.debug('Start server at %s', self.address)
def block(self):
""" Block until all threads close """
@@ -105,7 +87,7 @@ class Server(object):
def listen(self):
with logerrors():
- log(self.address, 'start listening')
+ logger.debug('Start listening %s', self.address)
while self.status != 'closed':
if not self.socket.poll(100):
continue
@@ -114,9 +96,9 @@ class Server(object):
payload = self.socket.recv_multipart()
address, command, payload = payload[0], payload[1], payload[2:]
- log('Server receives', address, command)
+ logger.debug('Server receives %s %s', address, command)
if command == b'close':
- log('Server closes')
+ logger.debug('Server closes')
self.ack(address)
self.status = 'closed'
break
@@ -127,7 +109,7 @@ class Server(object):
keys = list(map(deserialize_key, keys))
data = dict(zip(keys, values))
self.partd.append(data, lock=False)
- log('Server appends %d keys' % len(data))
+ logger.debug('Server appends %d keys', len(data))
self.ack(address)
elif command == b'iset':
@@ -138,14 +120,14 @@ class Server(object):
elif command == b'get':
keys = list(map(deserialize_key, payload))
- log('get', keys)
+ logger.debug('get %s', keys)
result = self.get(keys)
self.send_to_client(address, result)
self.ack(address, flow_control=False)
elif command == b'delete':
keys = list(map(deserialize_key, payload))
- log('delete', keys)
+ logger.debug('delete %s', keys)
self.partd.delete(keys, lock=False)
self.ack(address, flow_control=False)
@@ -157,7 +139,7 @@ class Server(object):
self.ack(address)
else:
- log("Unknown command", command)
+ logger.debug("Unknown command: %s", command)
raise ValueError("Unknown command: " + command)
def send_to_client(self, address, result):
@@ -169,12 +151,12 @@ class Server(object):
def ack(self, address, flow_control=True):
with logerrors():
- log('Server sends ack')
+ logger.debug('Server sends ack')
self.send_to_client(address, b'ack')
def append(self, data):
self.partd.append(data, lock=False)
- log('Server appends %d keys' % len(data))
+ logger.debug('Server appends %d keys', len(data))
def drop(self):
with logerrors():
@@ -182,13 +164,13 @@ class Server(object):
def get(self, keys):
with logerrors():
- log('Server gets keys', keys)
+ logger.debug('Server gets keys: %s', keys)
with self._lock:
result = self.partd.get(keys, lock=False)
return result
def close(self):
- log('Server closes')
+ logger.debug('Server closes')
self.status = 'closed'
self.block()
with ignoring(zmq.error.ZMQError):
@@ -266,7 +248,7 @@ class Client(Interface):
self.address = address
self.context = zmq.Context()
self.socket = self.context.socket(zmq.DEALER)
- log('Client connects to %s' % address)
+ logger.debug('Client connects to %s', address)
self.socket.connect(address)
self.send(b'syn', [], ack_required=False)
self.lock = NotALock() # Server sequentializes everything
@@ -277,13 +259,13 @@ class Client(Interface):
def __setstate__(self, state):
self.__init__(state['address'])
- log('Reconstruct client from pickled state')
+ logger.debug('Reconstruct client from pickled state')
def send(self, command, payload, recv=False, ack_required=True):
if ack_required:
ack = self.socket.recv_multipart()
assert ack == [b'ack']
- log('Client sends command', command)
+ logger.debug('Client sends command: %s', command)
self.socket.send_multipart([command] + payload)
if recv:
result = self.socket.recv_multipart()
@@ -296,18 +278,18 @@ class Client(Interface):
Lock argument is ignored. Everything is sequential (I think)
"""
- log('Client gets', self.address, keys)
+ logger.debug('Client gets %s %s', self.address, keys)
keys = list(map(serialize_key, keys))
return self.send(b'get', keys, recv=True)
def append(self, data, lock=None):
- log('Client appends', self.address, str(len(data)) + ' keys')
+ logger.debug('Client appends %s %s', self.address, str(len(data)) + ' keys')
data = keymap(serialize_key, data)
payload = list(chain.from_iterable(data.items()))
self.send(b'append', payload)
def _delete(self, keys, lock=None):
- log('Client deletes', self.address, str(len(keys)) + ' keys')
+ logger.debug('Client deletes %s %s', self.address, str(len(keys)) + ' keys')
keys = list(map(serialize_key, keys))
self.send(b'delete', keys)
diff --git a/setup.py b/setup.py
index f8dec2d..4301711 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from os.path import exists
from setuptools import setup
setup(name='partd',
- version='0.3.6',
+ version='0.3.7',
description='Appendable key-value storage',
url='http://github.com/dask/partd/',
maintainer='Matthew Rocklin',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/partd.git
More information about the Python-modules-commits
mailing list