From 561a8ca7780e1efa80173e6f0dfd5339aaf0b689 Mon Sep 17 00:00:00 2001 From: Marcin Koziej Date: Fri, 14 Sep 2012 13:05:47 +0200 Subject: [PATCH] profile log with a pid. remove unecessary memory information --- apps/catalogue/management/commands/importbooks.py | 9 ++------- apps/wolnelektury_core/management/profile.py | 3 ++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/apps/catalogue/management/commands/importbooks.py b/apps/catalogue/management/commands/importbooks.py index 42554b78a..323755e58 100644 --- 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 -import objgraph -import gc 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, @@ -130,14 +129,10 @@ class Command(BaseCommand): if import_picture: self.import_picture(file_path, options) else: - objgraph.show_growth() self.import_book(file_path, options) - objgraph.show_growth() - print "--------------------" - + 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.' % diff --git a/apps/wolnelektury_core/management/profile.py b/apps/wolnelektury_core/management/profile.py index a68453d05..90e5ec5f5 100644 --- a/apps/wolnelektury_core/management/profile.py +++ b/apps/wolnelektury_core/management/profile.py @@ -1,6 +1,7 @@ import cProfile import functools +import os _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(), - "wlprofile") + "profile.%d" % os.getpid()) functools.update_wrapper(_wrapper, meth) return _wrapper -- 2.20.1