dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge github.com:web2py/web2py

Browse Source
This commit is contained in:
Michele Comitini
2012-10-22 12:51:58 +02:00
parent a451796562 37bc09169f
commit d10774b3ae
5 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+10
View File
@@ -1,3 +1,13 @@
## 2.2.1
- session.connect(cookie_key='secret', compression_level=9) stores sessions in cookies
- T.is_writable = False prevents T from dynamically updating langauge files
- all code is more PEP8 compliant
- better custom_importer behaviour (now works per app, is smalled and faster)
- fixed some bugs
- upgraded feedparser.py and rss2.py
- codemirror has autoresize
## 2.1.0 ## 2.1.0
- overall faster web2py - overall faster web2py
Makefile
+1 -1
View File
@@ -29,7 +29,7 @@ update:
wget -O gluon/contrib/simplejsonrpc.py http://rad2py.googlecode.com/hg/ide2py/simplejsonrpc.py wget -O gluon/contrib/simplejsonrpc.py http://rad2py.googlecode.com/hg/ide2py/simplejsonrpc.py
echo "remember that pymysql was tweaked" echo "remember that pymysql was tweaked"
src: src:
echo 'Version 2.1.1 ('`date +%Y-%m-%d\ %H:%M:%S`') dev' > VERSION echo 'Version 2.2.1 ('`date +%Y-%m-%d\ %H:%M:%S`') stable' > VERSION
### rm -f all junk files ### rm -f all junk files
make clean make clean
### clean up baisc apps ### clean up baisc apps
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.1.1 (2012-10-20 15:27:09) dev Version 2.2.1 (2012-10-21 10:54:10) stable
gluon/scheduler.py
+2 -2
View File
@@ -789,7 +789,7 @@ class Scheduler(MetaScheduler):
db(st.status.belongs( db(st.status.belongs(
(QUEUED, ASSIGNED)))(st.stop_time < now).update(status=EXPIRED) (QUEUED, ASSIGNED)))(st.stop_time < now).update(status=EXPIRED)
all_available = db(st.status.belongs((QUEUED, ASSIGNED)))((st.times_run < st.repeats) | (st.repeats == 0))(st.start_time <= now)((st.stop_time is None) | (st.stop_time > now))(st.next_run_time <= now)(st.enabled == True) all_available = db(st.status.belongs((QUEUED, ASSIGNED)))((st.times_run < st.repeats) | (st.repeats == 0))(st.start_time <= now)((st.stop_time == None) | (st.stop_time > now))(st.next_run_time <= now)(st.enabled == True)
limit = len(all_workers) * (50 / len(wkgroups)) limit = len(all_workers) * (50 / len(wkgroups))
#if there are a moltitude of tasks, let's figure out a maximum of tasks per worker. #if there are a moltitude of tasks, let's figure out a maximum of tasks per worker.
#this can be adjusted with some added intelligence (like esteeming how many tasks will #this can be adjusted with some added intelligence (like esteeming how many tasks will
@@ -805,7 +805,7 @@ class Scheduler(MetaScheduler):
#let's freeze it up #let's freeze it up
db.commit() db.commit()
for group in wkgroups.keys(): for group in wkgroups.keys():
tasks = all_available(st.group_name == group).select( tasks = all_available(st.group_name==group).select(
limitby=(0, limit), orderby=st.next_run_time) limitby=(0, limit), orderby=st.next_run_time)
#let's break up the queue evenly among workers #let's break up the queue evenly among workers
for task in tasks: for task in tasks:
gluon/tools.py
+1 -1
View File
@@ -5082,7 +5082,7 @@ class Wiki(object):
content.append(DIV(form, _class='w2p_wiki_form')) content.append(DIV(form, _class='w2p_wiki_form'))
if request.vars.q: if request.vars.q:
tags = [v.strip() for v in request.vars.q.split(',')] tags = [v.strip() for v in request.vars.q.split(',')]
tags = [v for v in tags if v] tags = [v.lower() for v in tags if v]
if tags or not query is None: if tags or not query is None:
db = self.auth.db db = self.auth.db
count = db.wiki_tag.wiki_page.count() count = db.wiki_tag.wiki_page.count()