From d4de7dcee7f1759d1318e982f0ca9eab0b4b7ef6 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Dec 08 2015 09:34:29 +0000 Subject: [PATCH 1/2] Let's show all the sections on the front page by default --- diff --git a/pagure/default_config.py b/pagure/default_config.py index f26737c..29e4afa 100644 --- a/pagure/default_config.py +++ b/pagure/default_config.py @@ -51,7 +51,7 @@ ENABLE_DEL_PROJECTS = True ENABLE_USER_MNGT = True # Enables / Disables showing all the projects by default on the front page -SHOW_PROJECTS_INDEX = [] +SHOW_PROJECTS_INDEX = ['repos', 'myrepos', 'myforks'] # The URL to use to clone the git repositories. GIT_URL_SSH = 'ssh://git@pagure.org/' From 841a58bb59f1ffdcccd63d1cce592c81569a8116 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Dec 08 2015 09:43:57 +0000 Subject: [PATCH 2/2] Adjust pagure to work on recent version of psutils as well as the old one Fixes https://pagure.io/pagure/issue/524 --- diff --git a/pagure/mail_logging.py b/pagure/mail_logging.py index 405872e..5f74125 100644 --- a/pagure/mail_logging.py +++ b/pagure/mail_logging.py @@ -76,8 +76,17 @@ class ContextInjector(logging.Filter): # pragma: no cover record.pid = '-' if not isinstance(current_process, str): record.pid = current_process.pid - record.proc_name = current_process.name - record.command_line = " ".join(current_process.cmdline) + # Be compatible with python-psutil 1.0 and 2.0, 3.0 + proc_name = current_process.name + if callable(proc_name): + proc_name = proc_name() + record.proc_name = proc_name + # Be compatible with python-psutil 1.0 and 2.0, 3.0 + cmd_line = current_process.cmdline + if callable(cmd_line): + cmd_line = cmd_line() + record.command_line = " ".join(cmd_line) + record.callstack = self.format_callstack() record.url = '-'