profile log with a pid. remove unecessary memory information

diff --git a/apps/catalogue/management/commands/importbooks.py b/apps/catalogue/management/commands/importbooks.py
index 42554b7..323755e 100644 (file)
--- a/apps/catalogue/management/commands/importbooks.py
+++ b/apps/catalogue/management/commands/importbooks.py
@@ -13,14 +13,13 @@ from django.core.files import File
 from catalogue.utils import trim_query_log
 
 from wolnelektury_core.management.profile import profile
 from catalogue.utils import trim_query_log
 
 from wolnelektury_core.management.profile import profile

-import objgraph
-import gc

 
 from catalogue.models import Book
 from picture.models import Picture
 
 from search import Index
 
 
 from catalogue.models import Book
 from picture.models import Picture
 
 from search import Index
 

+

 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
         make_option('-q', '--quiet', action='store_false', dest='verbose', default=True,
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
         make_option('-q', '--quiet', action='store_false', dest='verbose', default=True,


@@ -130,14 +129,10 @@ class Command(BaseCommand):
                         if import_picture:
                             self.import_picture(file_path, options)
                         else:
                         if import_picture:
                             self.import_picture(file_path, options)
                         else:

-                            objgraph.show_growth()

                             self.import_book(file_path, options)
                             self.import_book(file_path, options)

-                            objgraph.show_growth()
-                            print "--------------------"
-                            
+

                         files_imported += 1
                         transaction.commit()
                         files_imported += 1
                         transaction.commit()

-                        ## track.

                         
                     except (Book.AlreadyExists, Picture.AlreadyExists):
                         print self.style.ERROR('%s: Book or Picture already imported. Skipping. To overwrite use --force.' %
                         
                     except (Book.AlreadyExists, Picture.AlreadyExists):
                         print self.style.ERROR('%s: Book or Picture already imported. Skipping. To overwrite use --force.' %

diff --git a/apps/wolnelektury_core/management/profile.py b/apps/wolnelektury_core/management/profile.py
index a68453d..90e5ec5 100644 (file)
--- a/apps/wolnelektury_core/management/profile.py
+++ b/apps/wolnelektury_core/management/profile.py
@@ -1,6 +1,7 @@
 
 import cProfile
 import functools
 
 import cProfile
 import functools

+import os

 
 _object = None
 
 
 _object = None
 


@@ -9,7 +10,7 @@ def profile(meth):
         object = self
         setattr(object, "__%s" % meth.__name__, meth)
         cProfile.runctx('object.__%s(object, *args, **kwargs)' % (meth.__name__, ), globals(), locals(),
         object = self
         setattr(object, "__%s" % meth.__name__, meth)
         cProfile.runctx('object.__%s(object, *args, **kwargs)' % (meth.__name__, ), globals(), locals(),

-            "wlprofile")
+            "profile.%d" % os.getpid())

 
     functools.update_wrapper(_wrapper, meth)
     return _wrapper
 
     functools.update_wrapper(_wrapper, meth)
     return _wrapper