Squashed commit of the following:
commit cb509e8f75e3dcdbc66327be4bfbf6661aa084b5 Author: David Snopek <dsnopek@gmail.com> Date: Fri Jul 12 22:06:28 2013 +0100 Cut down 'import' statements to only modules actually used. commit 0ea255115e095e31af5a991e9cce2b5b15cb496d Author: David Snopek <dsnopek@gmail.com> Date: Fri Jul 12 22:00:06 2013 +0100 * Add getCollectionManager() so that the whole process can share the same ThreadingCollectionManager object. * Got the RestApp actually working! commit 00997bab600b13d4b430ed2c2839b1d2232f55ed Author: David Snopek <dsnopek@gmail.com> Date: Fri Jul 12 21:04:58 2013 +0100 Got the sync_app working again (more or less) commit 459c69566bb92d2c0195a384e067d98c059bdea7 Author: David Snopek <dsnopek@gmail.com> Date: Fri Jul 12 19:47:40 2013 +0100 Started implementing test for the RESTful callbacks that PrepECN is going to need. commit 7ffbac793f9bf45ab9056c1de475422b8742e107 Author: David Snopek <dsnopek@gmail.com> Date: Fri Jul 12 17:19:06 2013 +0100 Started work on a WSGI app for RESTful access to Anki based on Bibliobird code here: https://raw.github.com/dsnopek/bbcom/master/AnkiServer/AnkiServer/deck.py commit 8820411388ce0c2b7b14769c614c22c675d2dbdd Author: David Snopek <dsnopek@gmail.com> Date: Fri Jul 12 15:03:56 2013 +0100 * Seperated the collection and threading code. * Implemented a new interface to interact with the collections, which will hopefully be more transparent and testable.
This commit is contained in:
@@ -1,12 +1,15 @@
|
||||
|
||||
import sys
|
||||
sys.path.insert(0, "/usr/share/anki")
|
||||
|
||||
def server_runner(app, global_conf, **kw):
|
||||
""" Special version of paste.httpserver.server_runner which shuts down
|
||||
the AnkiServer.deck.thread_pool on server exit. """
|
||||
""" Special version of paste.httpserver.server_runner which calls
|
||||
AnkiServer.threading.shutdown() on server exit."""
|
||||
|
||||
from paste.httpserver import server_runner as paste_server_runner
|
||||
from AnkiServer.deck import thread_pool
|
||||
from AnkiServer.threading import shutdown
|
||||
try:
|
||||
paste_server_runner(app, global_conf, **kw)
|
||||
finally:
|
||||
thread_pool.shutdown()
|
||||
shutdown()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user