##// END OF EJS Templates
Merge pull request #2854 from minrk/2853b...
Merge pull request #2854 from minrk/2853b Move kernel code into IPython.kernel inprocess Kernel in kernel.inprocess zmq Kernel in kernel.zmq KernelManager stuff and ulities in top-level kernel Main functional change: allow custom kernel Popen command - [x] adds `KernelManager.kernel_cmd` configurable for launching a custom kernel - [x] splits entry_point.base_launch_kernel into two steps: making the launch cmd and launching the subprocess - [x] figure out where the entry_point functions belong, if it should be anywhere else - [x] move IPython.zmq.kernelmanagerabc to IPython.kernel.kernelmanagerabc - [x] move IPython.lib.kernel/IPython/zmq.entry_point to IPython.kernel.launcher / connect - [x] move zmq.ipkernelapp.IPKernelApp to zmq.kernelapp (I'll look at merging the classes, and see if it makes - [x] move IPython.zmq to IPython.kernel.zmq - [x] move IPython.inprocess to IPython.kernel.inprocess - [x] move embed_kernel from zmq.ipkernelapp to zmq.embed - [x] move MultiKernelManager to IPython.kernel.multikernelmanager. - [x] move IPython.zmq.blockingkernelmanager to IPython.kernel.blockingkernelmanager. - [x] move IPython.zmq.kernelmanager to IPython.kernel.kernelmanager. - [x] move IPython.ipkernel.Kernel to IPython.kernel.kernel.

File last commit:

r9254:47921ff8
r9402:5db16721 merge
Show More
logwatcher.py
115 lines | 3.7 KiB | text/x-python | PythonLexer
MinRK
update recently changed modules with Authors in docstring
r4018 """
A simple logger object that consolidates messages incoming from ipcluster processes.
Authors:
* MinRK
"""
MinRK
Refactor newparallel to use Config system...
r3604
#-----------------------------------------------------------------------------
# Copyright (C) 2011 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
import logging
MinRK
resort imports in a cleaner order
r3631 import sys
MinRK
Refactor newparallel to use Config system...
r3604
import zmq
from zmq.eventloop import ioloop, zmqstream
MinRK
resort imports in a cleaner order
r3631
MinRK
add LoggingConfigurable base class
r4016 from IPython.config.configurable import LoggingConfigurable
W. Trevor King
parallel: Use utils.localinterfaces.LOCALHOST
r9254 from IPython.utils.localinterfaces import LOCALHOST
MinRK
cleanup parallel traits...
r3988 from IPython.utils.traitlets import Int, Unicode, Instance, List
MinRK
Refactor newparallel to use Config system...
r3604
#-----------------------------------------------------------------------------
# Classes
#-----------------------------------------------------------------------------
MinRK
add LoggingConfigurable base class
r4016 class LogWatcher(LoggingConfigurable):
MinRK
Refactor newparallel to use Config system...
r3604 """A simple class that receives messages on a SUB socket, as published
by subclasses of `zmq.log.handlers.PUBHandler`, and logs them itself.
This can subscribe to multiple topics, but defaults to all topics.
"""
MinRK
reorganize Factory classes to follow relocation of Session object
r4007
MinRK
Refactor newparallel to use Config system...
r3604 # configurables
MinRK
re-enable log forwarding and iplogger
r3989 topics = List([''], config=True,
help="The ZMQ topics to subscribe to. Default is to subscribe to all messages")
W. Trevor King
parallel: Use utils.localinterfaces.LOCALHOST
r9254 url = Unicode('tcp://%s:20202' % LOCALHOST, config=True,
MinRK
re-enable log forwarding and iplogger
r3989 help="ZMQ url on which to listen for log messages")
MinRK
Refactor newparallel to use Config system...
r3604
# internals
stream = Instance('zmq.eventloop.zmqstream.ZMQStream')
MinRK
re-enable log forwarding and iplogger
r3989
context = Instance(zmq.Context)
def _context_default(self):
return zmq.Context.instance()
loop = Instance(zmq.eventloop.ioloop.IOLoop)
MinRK
Refactor newparallel to use Config system...
r3604 def _loop_default(self):
return ioloop.IOLoop.instance()
MinRK
rework logging connections
r3610 def __init__(self, **kwargs):
super(LogWatcher, self).__init__(**kwargs)
MinRK
Refactor newparallel to use Config system...
r3604 s = self.context.socket(zmq.SUB)
s.bind(self.url)
self.stream = zmqstream.ZMQStream(s, self.loop)
self.subscribe()
self.on_trait_change(self.subscribe, 'topics')
MinRK
rework logging connections
r3610
def start(self):
MinRK
Refactor newparallel to use Config system...
r3604 self.stream.on_recv(self.log_message)
MinRK
rework logging connections
r3610 def stop(self):
self.stream.stop_on_recv()
MinRK
Refactor newparallel to use Config system...
r3604 def subscribe(self):
"""Update our SUB socket's subscriptions."""
self.stream.setsockopt(zmq.UNSUBSCRIBE, '')
MinRK
re-enable log forwarding and iplogger
r3989 if '' in self.topics:
self.log.debug("Subscribing to: everything")
self.stream.setsockopt(zmq.SUBSCRIBE, '')
else:
for topic in self.topics:
self.log.debug("Subscribing to: %r"%(topic))
self.stream.setsockopt(zmq.SUBSCRIBE, topic)
MinRK
Refactor newparallel to use Config system...
r3604
def _extract_level(self, topic_str):
"""Turn 'engine.0.INFO.extra' into (logging.INFO, 'engine.0.extra')"""
topics = topic_str.split('.')
for idx,t in enumerate(topics):
level = getattr(logging, t, None)
if level is not None:
break
if level is None:
level = logging.INFO
else:
topics.pop(idx)
return level, '.'.join(topics)
def log_message(self, raw):
"""receive and parse a message, then log it."""
if len(raw) != 2 or '.' not in raw[0]:
MinRK
rework logging connections
r3610 self.log.error("Invalid log message: %s"%raw)
MinRK
Refactor newparallel to use Config system...
r3604 return
else:
topic, msg = raw
# don't newline, since log messages always newline:
topic,level_name = topic.rsplit('.',1)
level,topic = self._extract_level(topic)
if msg[-1] == '\n':
msg = msg[:-1]
MinRK
re-enable log forwarding and iplogger
r3989 self.log.log(level, "[%s] %s" % (topic, msg))
MinRK
Refactor newparallel to use Config system...
r3604