[gozerbot] 3 new revisions pushed by bth...@gmail.com on 2011-08-10 00:17 GMT
goze...@googlecode.com
Revision: c230fff59553
Author: Bart Thate <bth...@gmail.com>
Date: Tue Aug 9 16:19:17 2011
Log: link 403 to 401
http://code.google.com/p/gozerbot/source/detail?r=c230fff59553
Revision: 662335802de1
Author: Bart Thate <bth...@gmail.com>
Date: Tue Aug 9 17:15:35 2011
Log: GOZERBOT 0.9.3 BETA2 .. fix for SQLITE
http://code.google.com/p/gozerbot/source/detail?r=662335802de1
Revision: 78b43732e1f4
Author: Bart Thate <bth...@gmail.com>
Date: Tue Aug 9 17:16:58 2011
Log: better fix
http://code.google.com/p/gozerbot/source/detail?r=78b43732e1f4
==============================================================================
Revision: c230fff59553
Author: Bart Thate <bth...@gmail.com>
Date: Tue Aug 9 16:19:17 2011
Log: link 403 to 401
http://code.google.com/p/gozerbot/source/detail?r=c230fff59553
Modified:
/gozerbot/irc/irc.py
=======================================
--- /gozerbot/irc/irc.py Thu Jul 14 15:02:38 2011
+++ /gozerbot/irc/irc.py Tue Aug 9 16:19:17 2011
@@ -1124,6 +1124,9 @@
except:
pass
+ handle_403 = handle_401
+
+
def handle_700(self, ievent):
""" handle 700 .. encoding request of the server. """
==============================================================================
Revision: 662335802de1
Author: Bart Thate <bth...@gmail.com>
Date: Tue Aug 9 17:15:35 2011
Log: GOZERBOT 0.9.3 BETA2 .. fix for SQLITE
http://code.google.com/p/gozerbot/source/detail?r=662335802de1
Modified:
/gozerbot/config.py
/gozerbot/database/alchemy.py
/setup.py
=======================================
--- /gozerbot/config.py Tue Jul 19 13:07:50 2011
+++ /gozerbot/config.py Tue Aug 9 17:15:35 2011
@@ -126,7 +126,7 @@
import gozerbot
self['version'] = "GOZERBOT %s " % gozerbot.__version__
- self['version'] += "BETA1"
+ self['version'] += "BETA2"
if verbose:
rlog(10, 'config', str(self))
=======================================
--- /gozerbot/database/alchemy.py Tue Aug 9 16:08:47 2011
+++ /gozerbot/database/alchemy.py Tue Aug 9 17:15:35 2011
@@ -111,11 +111,10 @@
# only show dburi if it doesn't contain a password
if '///' in dburi:
rlog(10, 'alchemy', 'starting database %s' % dburi)
+ engine = create_engine(dburi, strategy='threadlocal',
pool_recycle=3600)
else:
rlog(10, 'alchemy', 'starting database')
-
- # create engine
- engine = create_engine(dburi, strategy='threadlocal', pool_recycle=60,
pool_size=50, max_overflow=0)
+ engine = create_engine(dburi, strategy='threadlocal',
pool_recycle=60, pool_size=50, max_overflow=0)
# setup metadata and session
if not base:
=======================================
--- /setup.py Tue Jul 19 13:07:50 2011
+++ /setup.py Tue Aug 9 17:15:35 2011
@@ -8,42 +8,12 @@
from setuptools import setup
setup(
- name='gozerbot',
- version='0.9.3b1',
+ name='gozerplugs',
+ version='0.9.3b2',
url='http://gozerbot.googlecode.com',
- download_url="http://code.google.com/p/gozerbot/downloads",
author='Bart Thate',
author_email='bth...@gmail.com',
- description='the irc bot and jabber bot in one',
+ description='plugin package for gozerbot ',
license='BSD',
- scripts =
['bin/gozerbot', 'bin/gozerbot-init', 'bin/gozerbot-start', 'bin/gozerbot-stop', 'bin/gozerbot-upgrade', 'bin/gozerbot-udp', 'bin/gozerbot-install', 'bin/gozerbot-nest', 'bin/gozerbot-exec', 'bin/gozerbot-test'],
- packages=['gozerbot', 'gozerbot.contrib','gozerbot.rest', \
-'gozerbot.persist', 'gozerbot.utils', 'gozerbot.irc', \
-'gozerbot.plugs', 'gozerbot.compat', 'gozerbot.threads', 'gozerbot.database',
\
-'gozerbot.xmpp', 'gozerbot.gozernet'],
- install_requires = ['sqlalchemy >= 0.7.1',
- 'pytz >= 1.0',
- 'simplejson >= 1.0',
- 'feedparser >= 1.0',
- 'pydns >= 2.3.3'],
- long_description = """
-GOZERBOT is a channel bot that aids with conversation in irc channels
-and jabber conference rooms. its mainly used to send notifications (RSS,
-nagios, etc.) and to have custom commands made for the channel. More then
-just a channel bot GOZERBOT aims to provide a platform for the user to
-program his own bot and make it into something thats usefull. This is done
-with a plugin structure that makes it easy to program your own plugins.
-But GOZERBOT comes with some batteries included, there are now over 100
-plugins already written and ready for use.
-""",
- classifiers=[
- 'Development Status :: 4 - Beta',
- 'Environment :: Console',
- 'Intended Audience :: Developers',
- 'License :: OSI Approved :: BSD License',
- 'Operating System :: Unix',
- 'Programming Language :: Python',
- 'Topic :: Communications :: Chat :: Internet Relay Chat',
- 'Topic :: Software Development :: Libraries :: Python Modules',
- ],
-)
+ packages =
['gozerplugs', 'gozerplugs.webserver', 'gozerplugs.tracserver'],
+)
==============================================================================
Revision: 78b43732e1f4
Author: Bart Thate <bth...@gmail.com>
Date: Tue Aug 9 17:16:58 2011
Log: better fix
http://code.google.com/p/gozerbot/source/detail?r=78b43732e1f4
Modified:
/gozerbot/database/alchemy.py
=======================================
--- /gozerbot/database/alchemy.py Tue Aug 9 17:15:35 2011
+++ /gozerbot/database/alchemy.py Tue Aug 9 17:16:58 2011
@@ -111,10 +111,13 @@
# only show dburi if it doesn't contain a password
if '///' in dburi:
rlog(10, 'alchemy', 'starting database %s' % dburi)
- engine = create_engine(dburi, strategy='threadlocal',
pool_recycle=3600)
else:
rlog(10, 'alchemy', 'starting database')
+
+ try:
engine = create_engine(dburi, strategy='threadlocal',
pool_recycle=60, pool_size=50, max_overflow=0)
+ except:
+ engine = create_engine(dburi, strategy='threadlocal',
pool_recycle=3600)
# setup metadata and session
if not base: