|
a/Allura/allura/command/base.py |
|
b/Allura/allura/command/base.py |
|
... |
|
... |
| 23 |
global log, M
|
23 |
global log, M
|
| 24 |
if self.args:
|
24 |
if self.args:
|
| 25 |
conf = appconfig('config:%s' % self.args[0],relative_to=os.getcwd())
|
25 |
conf = appconfig('config:%s' % self.args[0],relative_to=os.getcwd())
|
| 26 |
try:
|
26 |
try:
|
| 27 |
if self.setup_global_config:
|
27 |
if self.setup_global_config:
|
| 28 |
logging.config.fileConfig(self.args[0])
|
28 |
logging.config.fileConfig(self.args[0], disable_existing_loggers=False)
|
| 29 |
except Exception:
|
29 |
except Exception:
|
| 30 |
try:
|
30 |
try:
|
| 31 |
# logging does not understand section#subsection syntax,
|
31 |
# logging does not understand section#subsection syntax,
|
| 32 |
# so strip away the #subsection and try again.
|
32 |
# so strip away the #subsection and try again.
|
| 33 |
logging.config.fileConfig(self.args[0].split('#')[0])
|
33 |
logging.config.fileConfig(self.args[0].split('#')[0], disable_existing_loggers=False)
|
| 34 |
except Exception:
|
34 |
except Exception:
|
| 35 |
print >> sys.stderr, (
|
35 |
print >> sys.stderr, (
|
| 36 |
'Could not configure logging with config file %s' % self.args[0])
|
36 |
'Could not configure logging with config file %s' % self.args[0])
|
| 37 |
from allura import model
|
37 |
from allura import model
|
| 38 |
M=model
|
38 |
M=model
|