You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2014/03/25 20:43:45 UTC
git commit: [#6561] happy output during setup-app;
change allura log level to INFO
Repository: allura
Updated Branches:
refs/heads/db/6561 [created] 9dd1cc72b
[#6561] happy output during setup-app; change allura log level to INFO
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/9dd1cc72
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/9dd1cc72
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/9dd1cc72
Branch: refs/heads/db/6561
Commit: 9dd1cc72bfdc1078165f3d6130e4fb179ccf454c
Parents: f970d43
Author: Dave Brondsema <da...@brondsema.net>
Authored: Fri Mar 14 21:32:31 2014 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Tue Mar 25 10:26:31 2014 -0400
----------------------------------------------------------------------
Allura/allura/model/artifact.py | 2 +-
Allura/allura/model/notification.py | 2 +-
Allura/allura/websetup/bootstrap.py | 7 +++++++
Allura/development.ini | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/9dd1cc72/Allura/allura/model/artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py
index 2f62ca4..2706b16 100644
--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -533,7 +533,7 @@ class VersionedArtifact(Artifact):
data=state(self).clone())
ss = self.__mongometa__.history_class(**data)
session(ss).insert_now(ss, state(ss))
- log.info('Snapshot version %s of %s',
+ log.debug('Snapshot version %s of %s',
self.version, self.__class__)
if update_stats:
if self.version > 1:
http://git-wip-us.apache.org/repos/asf/allura/blob/9dd1cc72/Allura/allura/model/notification.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/notification.py b/Allura/allura/model/notification.py
index 0ab15f8..164dc8b 100644
--- a/Allura/allura/model/notification.py
+++ b/Allura/allura/model/notification.py
@@ -235,7 +235,7 @@ class Notification(MappedClass):
if d.get('project_id', c.project._id) != c.project._id:
project = Project.query.get(_id=d['project_id'])
if project.notifications_disabled:
- log.info(
+ log.debug(
'Notifications disabled for project %s, not sending %s(%r)',
project.shortname, topic, artifact)
return None
http://git-wip-us.apache.org/repos/asf/allura/blob/9dd1cc72/Allura/allura/websetup/bootstrap.py
----------------------------------------------------------------------
diff --git a/Allura/allura/websetup/bootstrap.py b/Allura/allura/websetup/bootstrap.py
index 91916df..87bc932 100644
--- a/Allura/allura/websetup/bootstrap.py
+++ b/Allura/allura/websetup/bootstrap.py
@@ -28,6 +28,7 @@ from textwrap import dedent
import tg
from pylons import tmpl_context as c, app_globals as g
from paste.deploy.converters import asbool
+import ew
from ming import Session, mim
from ming.orm import state, session
@@ -39,6 +40,7 @@ from allura.lib import helpers as h
from allura import model as M
from allura.command import EnsureIndexCommand
from allura.command import CreateTroveCategoriesCommand
+from allura.websetup.schema import REGISTRY
from forgewiki import model as WM
@@ -68,6 +70,11 @@ def bootstrap(command, conf, vars):
# are we being called by the test suite?
test_run = conf.get('__file__', '').endswith('test.ini')
+ if not test_run:
+ # when this is run via the `setup-app` cmd, some macro rendering needs this set up
+ REGISTRY.register(ew.widget_context,
+ ew.core.WidgetContext('http', ew.ResourceManager()))
+
# if this is a test_run, skip user project creation to save time
make_user_projects = not test_run
http://git-wip-us.apache.org/repos/asf/allura/blob/9dd1cc72/Allura/development.ini
----------------------------------------------------------------------
diff --git a/Allura/development.ini b/Allura/development.ini
index b663f19..172cafb 100644
--- a/Allura/development.ini
+++ b/Allura/development.ini
@@ -345,7 +345,7 @@ level = INFO
handlers = console, stats
[logger_allura]
-level = DEBUG
+level = INFO
handlers =
qualname = allura