ready to merge to master #613

sandialabs · Apr 8, 2016 · 66f9c1b · 66f9c1b
1 parent be2d4ef
commit 66f9c1b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/packages/slycat/web/server/__init__.py b/packages/slycat/web/server/__init__.py
@@ -187,7 +187,6 @@ def get_model_arrayset_metadata(database, model, aid, arrays=None, statistics=No
   if arrays is None and statistics is None and unique is None:
     with server_cache.lock:
       mydict_as_string = cPickle.dumps(server_cache.cache)
-      server_cache.clean()
       cherrypy.log.error("\n\n in metadata call server cache size %s %s\n" % (sys.getsizeof(mydict_as_string),model["_id"]))
       if "artifact:%s%s" % (aid,model["_id"]) in server_cache.cache:
         cherrypy.log.error("\n\n found artifact\n")

diff --git a/packages/slycat/web/server/cleanup.py b/packages/slycat/web/server/cleanup.py
@@ -56,7 +56,7 @@ def _cache_cleanup_worker():
       import cherrypy
       cherrypy.log.error("Started server cache cleanup worker.")
       while True:
-        time.sleep(datetime.timedelta(minutes=15).total_seconds())
+        time.sleep(datetime.timedelta(minutes=30).total_seconds())
         with slycat.web.server.server_cache.lock:
           cherrypy.log.error("running server cache-cleanup thread cache size = %s mbs" % (sys.getsizeof(cPickle.dumps(slycat.web.server.server_cache.cache))/1024/1024))
           _cache_cleanup()
@@ -77,8 +77,8 @@ def _forced_cache_cleanup_worker():
 _forced_cache_cleanup_worker.thread.daemon = True
 
 def _cache_cleanup():
-  #TODO: add cleanup logic for cache
-  pass
+  del slycat.web.server.server_cache.cache
+  cherrypy.log.error("cache size now = %s mbs" % (sys.getsizeof(cPickle.dumps(slycat.web.server.server_cache.cache))/1024/1024))
 
 def start():
   """Called to start all of the cleanup worker threads."""

diff --git a/packages/slycat/web/server/handlers.py b/packages/slycat/web/server/handlers.py
@@ -1651,7 +1651,7 @@ def get_model_statistics(mid):
           total_hdf5_server_size += os.path.getsize(fp)
 
   return {
-    "server_cache_size": sys.getsizeof(cPickle.dumps(slycat.web.server.server_cache_new.cache)),
+    "server_cache_size": sys.getsizeof(cPickle.dumps(slycat.web.server.server_cache.cache)),
     "mid":mid,
     "hdf5_file_size":hdf5_file_size,
     "total_server_data_size": total_server_data_size,