[fea] should debug if needed

Author: mosquito

pypi_server/__init__.py

@@ -9,7 +9,7 @@
     ("Dmitry Orlov", "[email protected]")
 ]
 
-version_info = (0, 3, 3)
+version_info = (0, 3, 4)
 
 __version__ = ".".join(map(str, version_info))
 __author__ = ", ".join("{0} <{1}>".format(*author) for author in author_info)

pypi_server/cache.py

@@ -236,12 +236,11 @@ def _expire(self, key, args_key):
             if os.path.exists(fname):
                 os.remove(fname)
 
-        self.CACHE.pop(args_key)
+        self.CACHE.pop(args_key, -1)
         log.debug("EXPIRED Cache [%s] %r", key, args_key)
 
 
 signal.signal(signal.SIGUSR1, Cache.invalidate_all)
-signal.signal(signal.SIGUSR2, Cache.invalidate_all)
 
 
 MINUTE = 60

pypi_server/handlers/index.py

@@ -13,7 +13,6 @@
 class IndexHander(BaseHandler):
     @HTTPCache(600, True, 60)
     @coroutine
-    @Cache(60, ignore_self=True)
     def get(self):
         vendor_js, vendor_css, application, styles = yield [
             self.find(ROOT, 'static/vendor', '.js'),
@@ -32,7 +31,7 @@ def get(self):
 
     @staticmethod
     @threaded
-    @Cache(60)
+    @Cache(5)
     def find(base_dir, path, pattern):
         file_list = []
 

pypi_server/handlers/pypi/package.py

@@ -84,7 +84,7 @@ def get(self, package, version, filename):
             self.finish()
 
     @threaded
-    @Cache(60, ignore_self=True)
+    @Cache(60, ignore_self=True, files_cache=True)
     def find_file(self, package, version, filename):
         if not isinstance(package, Package):
             package = Package.find(package)

pypi_server/handlers/pypi/simple/packages.py

@@ -21,7 +21,7 @@ def get(self):
 
     @classmethod
     @threaded
-    @Cache(5)
+    @Cache(5, files_cache=True, ignore_self=True)
     def pkg_list(cls):
         return list(Package.select().order_by(Package.lower_name))
 
@@ -59,6 +59,7 @@ def rpc_list_packages(cls):
         return list(map(lambda x: x.name, Package.select()))
 
     @coroutine
+    @Cache(60, files_cache=True)
     def rpc_search(self, query, operator='or'):
         results = []
 

pypi_server/server.py

@@ -115,6 +115,12 @@ def on_interrupt(*args):
         for sig in (signal.SIGINT, signal.SIGTERM, signal.SIGQUIT):
             signal.signal(sig, on_interrupt)
 
+        def handle_pdb(sig, frame):
+            import pdb
+            pdb.Pdb().set_trace(frame)
+
+        signal.signal(signal.SIGUSR2, handle_pdb)
+
         log.debug("Creating application instance")
         app = Application(
             base_dir=ROOT,