Moksha-commits

moksha-commits@lists.fedorahosted.org

529 discussions

moksha.spec
by Luke Macken 15 Apr '11

15 Apr '11

moksha.spec | 1 + 1 file changed, 1 insertion(+) New commits: commit 1e45769663f5a2ab80b8251cb633caf1f7328a11 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Apr 15 14:42:46 2011 -0400 Add python-daemon to the BR diff --git a/moksha.spec b/moksha.spec index 45ba9a1..19fa1f7 100644 --- a/moksha.spec +++ b/moksha.spec @@ -32,6 +32,7 @@ BuildRequires: python-repoze-what-quickstart BuildRequires: python-shove BuildRequires: python-bunch BuildRequires: TurboGears2 +BuildRequires: python-daemon Requires: TurboGears2 Requires: python-toscawidgets >= 0.9.1

1 0

setup.py start-moksha
by Luke Macken 29 Mar '11

29 Mar '11

setup.py | 4 ++-- start-moksha | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) New commits: commit 7a6ca8007e1c261516fef2b901543301fc2d663b Author: Luke Macken <luke(a)civx.us> Date: Tue Mar 29 18:30:33 2011 -0400 Remove egg requirements on a couple of packages that lack egg-info on RHEL5 diff --git a/setup.py b/setup.py index d679380..63fb211 100644 --- a/setup.py +++ b/setup.py @@ -36,10 +36,10 @@ setup( "Sphinx", "Paver", "tw.forms", - "pytz", + #"pytz", "Babel", "pyOpenSSL", - "BeautifulSoup", + #"BeautifulSoup", "python-daemon", "repoze.what-quickstart", "repoze.what-pylons", diff --git a/start-moksha b/start-moksha index 5938070..e7826a5 100755 --- a/start-moksha +++ b/start-moksha @@ -13,6 +13,8 @@ if [ ! $VIRTUAL_ENV ]; then source tg2env/bin/activate # HACK: http://groups.google.com/group/turbogears/browse_thread/thread/0176623b9825… + easy_install pytz + easy_install BeautifulSoup easy_install Extremes easy_install -i http://www.turbogears.org/2.1/downloads/current/index tg.devtools #easy_install -i http://www.turbogears.org/2.0/downloads/current/index tg.devtools

1 0

Branch 'dev' - start-moksha
by Luke Macken 17 Mar '11

17 Mar '11

start-moksha | 3 +++ 1 file changed, 3 insertions(+) New commits: commit d4b63fbe779c3d45c8ec10ab972e82f012c015c4 Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Mar 16 23:07:55 2011 -0400 Also link in mllib for qpid if it's available diff --git a/start-moksha b/start-moksha index 5938070..0a833c7 100755 --- a/start-moksha +++ b/start-moksha @@ -66,6 +66,9 @@ if [ ! $VIRTUAL_ENV ]; then if [ -d /usr/lib/python*/site-packages/qpid ]; then ln -s /usr/lib/python*/site-packages/qpid tg2env/lib/python*/site-packages/ fi + if [ -d /usr/lib/python*/site-packages/mllib ]; then + ln -s /usr/lib/python*/site-packages/mllib tg2env/lib/python*/site-packages/ + fi else source tg2env/bin/activate fi

1 0

Branch 'dev' - moksha/templates
by Luke Macken 16 Mar '11

16 Mar '11

moksha/templates/widget.mak | 4 ++-- moksha/templates/widgets.mak | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit e26a8a927d3f8e12092de1d9462c21efe5aa9bd6 Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Mar 16 18:37:45 2011 -0400 Render our widgets with .display() to be TW1 and TW2 compat diff --git a/moksha/templates/widget.mak b/moksha/templates/widget.mak index c3ab842..0203691 100644 --- a/moksha/templates/widget.mak +++ b/moksha/templates/widget.mak @@ -1,9 +1,9 @@ <html> <head></head> - <body>${tmpl_context.widget(**options)}</body> + <body>${tmpl_context.widget.display(**options)}</body> % if hasattr(tmpl_context, 'moksha_socket') and not isinstance(tmpl_context.moksha_socket, basestring) : - ${tmpl_context.moksha_socket()} + ${tmpl_context.moksha_socket.display()} % endif </html> diff --git a/moksha/templates/widgets.mak b/moksha/templates/widgets.mak index e636937..ea87a80 100644 --- a/moksha/templates/widgets.mak +++ b/moksha/templates/widgets.mak @@ -4,12 +4,12 @@ </head> <body> % for widget in tmpl_context.widgets: - ${widget(**options.get(widget, dict()))} + ${widget.display(**options.get(widget, dict()))} % endfor </body> % if tmpl_context.moksha_socket: - ${tmpl_context.moksha_socket()} + ${tmpl_context.moksha_socket.display()} % endif </html>

1 0

moksha/apps
by Luke Macken 15 Mar '11

15 Mar '11

moksha/apps/metrics/moksha/apps/metrics/streams/metrics_stream.py | 9 +++++++++ 1 file changed, 9 insertions(+) New commits: commit b2c5fd99eb6d48fe89778adc2e54f96f03f225c6 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Mar 15 16:50:56 2011 -0400 Make the Metrics data producer configurable diff --git a/moksha/apps/metrics/moksha/apps/metrics/streams/metrics_stream.py b/moksha/apps/metrics/moksha/apps/metrics/streams/metrics_stream.py index e841f30..ab4c59a 100644 --- a/moksha/apps/metrics/moksha/apps/metrics/streams/metrics_stream.py +++ b/moksha/apps/metrics/moksha/apps/metrics/streams/metrics_stream.py @@ -15,11 +15,17 @@ # limitations under the License. import os +import logging import subprocess +from tg import config +from paste.deploy.converters import asbool + from moksha.lib.helpers import defaultdict from moksha.api.streams import PollingDataStream +log = logging.getLogger('moksha.hub') + PID = 0 NAME = -1 MEM_TOTAL = -2 @@ -36,6 +42,9 @@ class MokshaMetricsDataStream(PollingDataStream): poll_for_new_pids = False def __init__(self): + if not asbool(config.get('moksha.metrics_stream', False)): + log.info('Moksha Metrics Stream disabled') + return self.programs = self._find_programs() self.processors = self._find_processors() super(MokshaMetricsDataStream, self).__init__()

1 0

start-moksha
by Luke Macken 15 Mar '11

15 Mar '11

start-moksha | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit ffe090403ed1ccb97366d6b8681220df5a3d90c2 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Mar 15 16:21:30 2011 -0400 Tweak start-moksha to work with newer versions of Shove diff --git a/start-moksha b/start-moksha index 0e9e847..5938070 100755 --- a/start-moksha +++ b/start-moksha @@ -19,7 +19,9 @@ if [ ! $VIRTUAL_ENV ]; then # Hack around Shove's hard SQLAlchemy requirement :( easy_install -U Shove - sed -i -e 's/SQLAlchemy==0\.4/SQLAlchemy/' tg2env/lib/python*/site-packages/shove-*.egg/EGG-INFO/requires.txt + if [ -f tg2env/lib/python*/site-packages/shove-*.egg/EGG-INFO/requires.txt ]; then + sed -i -e 's/SQLAlchemy==0\.4/SQLAlchemy/' tg2env/lib/python*/site-packages/shove-*.egg/EGG-INFO/requires.txt + fi easy_install -U SQLAlchemy easy_install Paver easy_install Twisted

1 0

setup.py
by Luke Macken 15 Mar '11

15 Mar '11

setup.py | 1 + 1 file changed, 1 insertion(+) New commits: commit 0eb213591d4eaac90aa15e2857e59d8c66d7ed27 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Mar 15 16:02:35 2011 -0400 Require bunch diff --git a/setup.py b/setup.py index 64ce716..d679380 100644 --- a/setup.py +++ b/setup.py @@ -44,6 +44,7 @@ setup( "repoze.what-quickstart", "repoze.what-pylons", "repoze.tm2", + "Bunch", "Mako", "Genshi", #"repoze.squeeze", # Not hard requirements

1 0

docs/main
by Luke Macken 15 Mar '11

15 Mar '11

docs/main/FeedStream.rst | 3 +++ 1 file changed, 3 insertions(+) New commits: commit 15887a7aa3825541319aab49bbdd9de4dd7e7c0f Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Mar 15 15:47:24 2011 -0400 Document our new feed strema knob diff --git a/docs/main/FeedStream.rst b/docs/main/FeedStream.rst index 89a6741..8287034 100644 --- a/docs/main/FeedStream.rst +++ b/docs/main/FeedStream.rst @@ -37,6 +37,9 @@ The feed app can be configured with the following options in your config file: .. code-block:: python + # Enable the feed aggregator in the moksha-hub + moksha.feedaggregator = True + # Number of seconds between polling feeds feed.poll_frequency = 900

1 0

4 commits - moksha/api moksha/apps moksha/hub start-moksha
by Luke Macken 15 Mar '11

15 Mar '11

moksha/api/streams/datastream.py | 8 +++++--- moksha/apps/feeds/moksha/apps/feeds/streams.py | 10 ++++++++-- moksha/hub/amqp/__init__.py | 9 +++------ start-moksha | 5 +++++ 4 files changed, 21 insertions(+), 11 deletions(-) New commits: commit fd1d8f6ee71849bd76a80e8cf6bac409fe6d1189 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Mar 15 15:45:16 2011 -0400 Allow people to disable the moksha feed aggregation stream with the moksha.feedaggregator variable in your ini diff --git a/moksha/apps/feeds/moksha/apps/feeds/streams.py b/moksha/apps/feeds/moksha/apps/feeds/streams.py index f892da5..912f809 100644 --- a/moksha/apps/feeds/moksha/apps/feeds/streams.py +++ b/moksha/apps/feeds/moksha/apps/feeds/streams.py @@ -29,6 +29,7 @@ except ImportError: from twisted.web import client from twisted.web.client import HTTPPageGetter, HTTPClientFactory from twisted.internet import reactor, protocol, defer +from paste.deploy.converters import asbool from datetime import timedelta from feedcache import Cache @@ -294,10 +295,15 @@ class MokshaFeedStream(PollingDataStream): AMQP messages will be sent to the `feeds.$URL` queue. """ #frequency = timedelta(minutes=1) - now = True + now = False def __init__(self): - self.frequency = int(config.get('feed.poll_frequency', 900)) + enabled = asbool(config.get('moksha.feedaggregator', False)) + if not enabled: + log.info('Moksha Feed Aggregator disabled') + return + else: + self.frequency = int(config.get('feed.poll_frequency', 900)) super(MokshaFeedStream, self).__init__() def poll(self): commit 1c1c3678b5cfae6ed189d28e3a5ee0b5276b52d3 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Mar 15 15:44:58 2011 -0400 Make our datastream shutdown procedures more robust diff --git a/moksha/api/streams/datastream.py b/moksha/api/streams/datastream.py index 5c10e0e..0de9514 100644 --- a/moksha/api/streams/datastream.py +++ b/moksha/api/streams/datastream.py @@ -46,8 +46,9 @@ class DataStream(object): log.error('Cannot send message: %s' % e) def stop(self): - self.hub.close() - if self.DBSession: + if hasattr(self, 'hub') and self.hub: + self.hub.close() + if hasattr(self, 'DBSession') and self.DBSession: self.DBSession.close() @@ -78,6 +79,7 @@ class PollingDataStream(DataStream): def stop(self): super(PollingDataStream, self).stop() try: - self.timer.stop() + if hasattr(self, 'timer'): + self.timer.stop() except Exception, e: self.log.warn(e) commit d89e701c2cc9151b636642f7f3c4806a0e118c18 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Mar 15 13:14:15 2011 -0400 If we're using a virtualenv and have python-qpid installed, symlink it in diff --git a/start-moksha b/start-moksha index 1514fbe..0e9e847 100755 --- a/start-moksha +++ b/start-moksha @@ -59,6 +59,11 @@ if [ ! $VIRTUAL_ENV ]; then #./pip.py install -E tg2env -r normal-reqs.txt --extra-index-url=http://www.turbogears.org/2.0/downloads/current/index #easy_install -i http://www.turbogears.org/2.0/downloads/current/index tg.devtools #pushd moksha/widgetbrowser; python setup.py develop; popd + + # Link the python-qpid modules into our virtualenv, if they exist + if [ -d /usr/lib/python*/site-packages/qpid ]; then + ln -s /usr/lib/python*/site-packages/qpid tg2env/lib/python*/site-packages/ + fi else source tg2env/bin/activate fi commit bf12bec884f8a27acef88b6f089efb13036483c8 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Mar 15 13:13:55 2011 -0400 Warn if we are trying to use AMQP but can't import qpid diff --git a/moksha/hub/amqp/__init__.py b/moksha/hub/amqp/__init__.py index 98ada27..8bed9af 100644 --- a/moksha/hub/amqp/__init__.py +++ b/moksha/hub/amqp/__init__.py @@ -16,20 +16,17 @@ """ Here is where we configure which AMQP hub implementation we are going to use. """ -import logging -log = logging.getLogger(__name__) - try: from qpid010 import QpidAMQPHub AMQPHub = QpidAMQPHub except ImportError: - log.debug("Cannot find qpid python module") + print("Cannot find qpid python module. Make sure you have python-qpid installed.") try: from pyamqplib import AMQPLibHub AMQPHub = AMQPLibHub except ImportError: - log.debug("Cannot find pyamqplib") - log.debug("Using FakeHub AMQP broker. Don't expect AMQP to work") + print("Cannot find pyamqplib") + print("Using FakeHub AMQP broker. Don't expect AMQP to work") class FakeHub(object): pass AMQPHub = FakeHub

1 0

docs/main
by Luke Macken 08 Feb '11

08 Feb '11

docs/main/FeedStream.rst | 89 +++++++++++++++++++++++++++++++++++++++++++ docs/main/FeedWidget.rst | 95 ++++++++++++++++++++++++++++++++++++++++++++++ docs/main/Feeds.rst | 97 +---------------------------------------------- 3 files changed, 188 insertions(+), 93 deletions(-) New commits: commit 6a7b5cbd8122f2ea27a9e456e964721b5ed12a24 Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Feb 7 20:21:39 2011 -0500 Document our moksha feed aggregator and new post-processing feed hooks diff --git a/docs/main/FeedStream.rst b/docs/main/FeedStream.rst new file mode 100644 index 0000000..89a6741 --- /dev/null +++ b/docs/main/FeedStream.rst @@ -0,0 +1,89 @@ +The Moksha Feed Stream +---------------------- + +The ``moksha.feeds`` app provides a moksha Producer_ that will handle +automatically fetching, parsing, and caching feeds. Once installed, the Moksha Feed Stream will be run by the MokshaHub_. + +It will automatically fetch all feeds used by the Moksha :class:`Feed` object, +as well as all feeds listed in a ``feeds.txt`` file, if one exists. + +Installing the ``moksha.feeds`` app +----------------------------------- + +Currently the easiest way to install the app is from the moksha git repository + +.. code-block:: bash + + $ git clone git://git.fedorahosted.org/git/moksha + $ cd moksha/apps/feeds + + +From here, if you are running Moksha from an RPM installation: + +.. code-block:: bash + + $ paver reinstall + +Or, if you're running from a virtualenv installation: + +.. code-block:: bash + + $ paver install + +Configuring the Moksha Feed Aggregator +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The feed app can be configured with the following options in your config file: + +.. code-block:: python + + # Number of seconds between polling feeds + feed.poll_frequency = 900 + + # Where to store the feed caches. Defaults to an in-memory cache. + #feed_cache = sqlite:///%(here)s/feeds.db + + # Max age (in seconds) of each feed in the cache + feed.max_age = 300 + + # Timeout in seconds for the web request + feed.timeout = 60 + + # The number of simultaneous connections + feed.deferred_groups = 3 + + +Performing post-processing on feed entries +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +All new feed entries for a given ``$URL`` are sent to the ``moksha.feeds.$URL`` +message topic. By default only the title and url of the entry are sent to the +message broker. However, Moksha provides a simple API for writing +post-processing plug-ins that can modify the feed before it is sent to any +:doc:`LiveWidgets` or :doc:`Consumers`. + +.. code-block:: python + + def process_feed_entry(entry): + """ This method is called by the Moksha Feed Streamer with each feed entry. + + Here is where we do post-processing on the entry before it gets serialized + to JSON and send to our message broker, and then the users. + + :entry: A :mod:`feedparser` feed object + """ + return dict(author=entry['author'], + author_link=entry['author_detail']['href'], + content=entry['content'][0]['value'], + author_avatar=entry['source']['icon']) + +Then you simply plug this method into the ``moksha.feeds.post_processor`` entry-point: + +.. code-block:: python + + setup(... + entry_points=""" + [moksha.feeds.post_processor] + myfeedprocessor = myapp.feed_processor:process_feed_entry + """ + ) diff --git a/docs/main/FeedWidget.rst b/docs/main/FeedWidget.rst new file mode 100644 index 0000000..4838e8c --- /dev/null +++ b/docs/main/FeedWidget.rst @@ -0,0 +1,95 @@ +The Moksha Feed Widget +---------------------- + +.. autoclass:: moksha.api.widgets.feed.Feed + :members: + +.. widgetbrowser:: moksha.widgets.demos.FeedDemo + :tabs: demo, source, template + :size: large + +Using the Feed widget +~~~~~~~~~~~~~~~~~~~~~ + +.. code-block:: python + + from moksha.api.widgets.feed import Feed + feed = Feed('myfeed') + feed(url='http://lewk.org/rss') + +Rendering a url with the Feed object +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. code-block:: python + + feed = Feed('myfeed') + feed(url='http://lewk.org/rss') + +.. note:: + Usually you would instantiate a single Feed object somewhere in your + project, and just call it with a `url` when rendering it in your templates. + +Subclassing +~~~~~~~~~~~ + +.. code-block:: python + + class MyFeed(Feed): + url = 'http://foo.com/feed.xml' + + myfeed = MyFeed() + myfeed() # renders the widget, usually done in the template + +As ToscaWidget children +~~~~~~~~~~~~~~~~~~~~~~~ + +By defining your Feeds as children to a widget, ToscaWidgets will automatically +handle setting a unique id for your Feed object, as well as giving you the +ability access it in your template from the `c` context object. + +.. code-block:: python + + from tw.api import Widget + from moksha.api.widgets.feed import Feed + + class MyWidget(Widget): + myfeedurl = 'http://foo.com/feed.xml' + children = [Feed('myfeed', url=myfeedurl)] + template = "${c.myfeed()}" + +As a generator +~~~~~~~~~~~~~~ + +.. code-block:: python + + feed = Feed('myfeed', url='http://foo.com/feed.xml') + print '%d entries' % feed.num_entries() + for entry in feed.iterentries(): + print entry.title + +Using the moksha feed cache by hand +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The moksha Feed widget automatically handles fetching and caching your feeds +using the global moksha feed cache. The moksha middleware automatically +handles setting up this object, and making it available for all of the +applications and widgets. Moksha utilizes `Doug Hellmann's feedcache module <http://www.doughellmann.com/projects/feedcache>`_, which intelligently handles +all of the hard work for us. + +Here is an example of using the feed cache to manually fetch a feed. + + +.. code-block:: python + + import moksha + feed = moksha.feed_cache.fetch('http://foo.com/feed.xml') + for entry in feed.entries: + print entry + +.. note:: + The moksha.feed_cache object is a + :class:`paste.registry.StackedObjectProxy` instance, and is setup by the + :class:`moksha.middleware.MokshaMiddleware` before each request reaches + your application. Thus, it only works during requests and cannot be + used without using the MokshaMiddleware. + diff --git a/docs/main/Feeds.rst b/docs/main/Feeds.rst index b6e7bdb..24256b2 100644 --- a/docs/main/Feeds.rst +++ b/docs/main/Feeds.rst @@ -11,97 +11,8 @@ When used within the Moksha Platform, the Feed object will utilize the central global `moksha.feed_cache`. When used outside of the platform, it will automatically use a local sqlite database cache. -The Moksha Feed Widget ----------------------- +.. toctree:: + :maxdepth: 2 -.. autoclass:: moksha.api.widgets.feed.Feed - :members: - -.. widgetbrowser:: moksha.widgets.demos.FeedDemo - :tabs: demo, source, template - :size: large - -Using the Feed widget -~~~~~~~~~~~~~~~~~~~~~ - -.. code-block:: python - - from moksha.api.widgets.feed import Feed - feed = Feed('myfeed') - feed(url='http://lewk.org/rss') - -Rendering a url with the Feed object -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -.. code-block:: python - - feed = Feed('myfeed') - feed(url='http://lewk.org/rss') - -.. note:: - Usually you would instantiate a single Feed object somewhere in your - project, and just call it with a `url` when rendering it in your templates. - -Subclassing -~~~~~~~~~~~ - -.. code-block:: python - - class MyFeed(Feed): - url = 'http://foo.com/feed.xml' - - myfeed = MyFeed() - myfeed() # renders the widget, usually done in the template - -As ToscaWidget children -~~~~~~~~~~~~~~~~~~~~~~~ - -By defining your Feeds as children to a widget, ToscaWidgets will automatically -handle setting a unique id for your Feed object, as well as giving you the -ability access it in your template from the `c` context object. - -.. code-block:: python - - from tw.api import Widget - from moksha.api.widgets.feed import Feed - - class MyWidget(Widget): - myfeedurl = 'http://foo.com/feed.xml' - children = [Feed('myfeed', url=myfeedurl)] - template = "${c.myfeed()}" - -As a generator -~~~~~~~~~~~~~~ - -.. code-block:: python - - feed = Feed('myfeed', url='http://foo.com/feed.xml') - print '%d entries' % feed.num_entries() - for entry in feed.iterentries(): - print entry.title - -Using the moksha feed cache by hand -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The moksha Feed widget automatically handles fetching and caching your feeds -using the global moksha feed cache. The moksha middleware automatically -handles setting up this object, and making it available for all of the -applications and widgets. Moksha utilizes `Doug Hellmann's feedcache module <http://www.doughellmann.com/projects/feedcache>`_, which intelligently handles -all of the hard work for us. - -Here is an example of using the feed cache to manually fetch a feed. - - -.. code-block:: python - - import moksha - feed = moksha.feed_cache.fetch('http://foo.com/feed.xml') - for entry in feed.entries: - print entry - -.. note:: - The moksha.feed_cache object is a - :class:`paste.registry.StackedObjectProxy` instance, and is setup by the - :class:`moksha.middleware.MokshaMiddleware` before each request reaches - your application. Thus, it only works during requests and cannot be - used without using the MokshaMiddleware. + FeedWidget + FeedStream

1 0

← Newer
1
2
3
4
5
6
7
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Moksha-commits