From e88395c433fa6004bee50c144b058d0108a61c68 Mon Sep 17 00:00:00 2001 From: Marcin Koziej Date: Wed, 28 Nov 2012 16:57:53 +0100 Subject: [PATCH] remove jvm leftovers, gaa! --- apps/catalogue/models/listeners.py | 1 - apps/pdcounter/models.py | 1 - apps/search/__init__.py | 2 -- wolnelektury/settings/custom.py | 3 --- 4 files changed, 7 deletions(-) diff --git a/apps/catalogue/models/listeners.py b/apps/catalogue/models/listeners.py index 93ad2d788..41c974ade 100644 --- a/apps/catalogue/models/listeners.py +++ b/apps/catalogue/models/listeners.py @@ -61,7 +61,6 @@ if not settings.NO_SEARCH_INDEX: def _remove_book_from_index_handler(sender, instance, **kwargs): """ remove the book from search index, when it is deleted.""" import search - search.JVM.attachCurrentThread() idx = search.Index() idx.open(timeout=10000) # 10 seconds timeout. try: diff --git a/apps/pdcounter/models.py b/apps/pdcounter/models.py index 35cbe2999..50eb43e1f 100644 --- a/apps/pdcounter/models.py +++ b/apps/pdcounter/models.py @@ -92,7 +92,6 @@ if not settings.NO_SEARCH_INDEX: def update_index(sender, instance, **kwargs): import search print "update pd index %s [update %s]" % (instance, 'created' in kwargs) - search.JVM.attachCurrentThread() idx = search.Index() idx.open() try: diff --git a/apps/search/__init__.py b/apps/search/__init__.py index 279d281e3..8081416c6 100644 --- a/apps/search/__init__.py +++ b/apps/search/__init__.py @@ -1,4 +1,2 @@ -#import lucene -#from index import Index, Search, ReusableIndex, SearchResult, JVM, IndexChecker, IndexStore from index import Index, Search, SearchResult diff --git a/wolnelektury/settings/custom.py b/wolnelektury/settings/custom.py index 446c730ee..a0bab7a64 100644 --- a/wolnelektury/settings/custom.py +++ b/wolnelektury/settings/custom.py @@ -16,6 +16,3 @@ CATALOGUE_CUSTOMPDF_RATE_LIMIT = '1/m' # set to 'new' or 'old' to skip time-consuming test # for TeX morefloats library version LIBRARIAN_PDF_MOREFLOATS = None - -# Max memory used by search -JVM_MAXHEAP = '256m' -- 2.20.1