details: http://www.bx.psu.edu/hg/galaxy/rev/30f4ab3cc266
changeset: 1500:30f4ab3cc266
user: James Taylor <james(a)jamestaylor.org>
date: Wed Sep 10 09:58:29 2008 -0400
description:
Allow complete logging configuration to be specified in the ini file,
in which case this is used instead of the "log_level" and "log_format"
keys under the app configuration. PasteScript actually handles this, so
we just do nothing related to logging config if the ini file contains a
"[loggers]" section. For example, you could add this to the end of your
universe_wsgi.ini to include SQLAlchemy debugging and include the thread
name with every log message.
# Logger overrides
[loggers]
keys = root, sqlalchemy.engine, sqlalchemy.orm.unitofwork, paste.httpserver.ThreadPool
[logger_root]
level = DEBUG
handlers = console
[logger_sqlalchemy.engine]
level = INFO
handlers = console
qualname = sqlalchemy.engine
[logger_sqlalchemy.orm.unitofwork]
level = DEBUG
handlers = console
qualname = sqlalchemy.orm.unitofwork
[logger_paste.httpserver.ThreadPool]
level = INFO
handlers = console
qualname = paste.httpserver.ThreadPool
[handlers]
keys = console
[handler_console]
class = StreamHandler
args = (sys.stderr,)
level = NOTSET
formatter = generic
[formatters]
keys = generic
[formatter_generic]
format = %(threadName)s %(name)s %(levelname)s %(asctime)s %(message)s
1 file(s) affected in this change:
lib/galaxy/config.py
diffs (28 lines):
diff -r f9d00dbefdec -r 30f4ab3cc266 lib/galaxy/config.py
--- a/lib/galaxy/config.py Mon Sep 08 16:00:49 2008 -0400
+++ b/lib/galaxy/config.py Wed Sep 10 09:58:29 2008 -0400
@@ -64,9 +64,10 @@
self.bugs_email = kwargs.get( 'bugs_email', None )
self.blog_url = kwargs.get( 'blog_url', None )
self.screencasts_url = kwargs.get( 'screencasts_url', None )
- #Parse global_conf
+ # Parse global_conf and save the parser
global_conf = kwargs.get( 'global_conf', None )
global_conf_parser = ConfigParser.ConfigParser()
+ self.global_conf_parser = global_conf_parser
if global_conf and "__file__" in global_conf:
global_conf_parser.read(global_conf['__file__'])
#Store per-tool runner config
@@ -118,6 +119,12 @@
Allow some basic logging configuration to be read from the cherrpy
config.
"""
+ # PasteScript will have already configured the logger if the appropriate
+ # sections were found in the config file, so we do nothing if the
+ # config has a loggers section, otherwise we do some simple setup
+ # using the 'log_*' values from the config.
+ if config.global_conf_parser.has_section( "loggers" ):
+ return
format = config.get( "log_format", "%(name)s %(levelname)s %(asctime)s %(message)s" )
level = logging._levelNames[ config.get( "log_level", "DEBUG" ) ]
destination = config.get( "log_destination", "stdout" )
details: http://www.bx.psu.edu/hg/galaxy/rev/ad69f789d1cd
changeset: 1498:ad69f789d1cd
user: guru
date: Mon Sep 08 14:54:40 2008 -0400
description:
Fix for grouping.py: New line character appended when grouping by the last column will now be trimmed.
1 file(s) affected in this change:
tools/stats/grouping.py
diffs (11 lines):
diff -r a17b2cd3d9a4 -r ad69f789d1cd tools/stats/grouping.py
--- a/tools/stats/grouping.py Mon Sep 08 14:36:37 2008 -0400
+++ b/tools/stats/grouping.py Mon Sep 08 14:54:40 2008 -0400
@@ -90,6 +90,7 @@
for ii, line in enumerate( file( tmpfile.name )):
if line and not line.startswith( '#' ):
+ line = line.strip()
try:
fields = line.split("\t")
item = fields[group_col]
details: http://www.bx.psu.edu/hg/galaxy/rev/d427760f8fec
changeset: 1494:d427760f8fec
user: Greg Von Kuster <greg(a)bx.psu.edu>
date: Mon Sep 08 09:16:32 2008 -0400
description:
Fix functional test for count tool and correct spelling errors in template.
1 file(s) affected in this change:
tools/filters/uniq.xml
diffs (33 lines):
diff -r e85d660c46ee -r d427760f8fec tools/filters/uniq.xml
--- a/tools/filters/uniq.xml Fri Sep 05 16:36:51 2008 -0400
+++ b/tools/filters/uniq.xml Mon Sep 08 09:16:32 2008 -0400
@@ -1,9 +1,9 @@
<tool id="Count1" name="Count">
- <description>occurences of each record</description>
+ <description>occurrences of each record</description>
<command interpreter="python">uniq.py -i $input -o $out_file1 -c "$column" -d $delim</command>
<inputs>
<param name="input" type="data" format="tabular" label="from query" help="Query missing? See TIP below"/>
- <param name="column" type="data_column" data_ref="input" multiple="True" numerical="False" label="Count occurencies of values in column(s)" help="Multi-select list - hold the appropriate key while clicking to select multiple columns" />
+ <param name="column" type="data_column" data_ref="input" multiple="True" numerical="False" label="Count occurrences of values in column(s)" help="Multi-select list - hold the appropriate key while clicking to select multiple columns" />
<param name="delim" type="select" label="Delimited by">
<option value="T">Tab</option>
<option value="Sp">Whitespace</option>
@@ -21,7 +21,7 @@
<test>
<param name="input" value="1.bed"/>
<output name="out_file1" file="uniq_out.dat"/>
- <param name="column" value="c1"/>
+ <param name="column" value="1"/>
<param name="delim" value="T"/>
</test>
</tests>
@@ -35,7 +35,7 @@
**Syntax**
-This tool counts occurences of unique values in selected column(s).
+This tool counts occurrences of unique values in selected column(s).
- If multiple columns are selected, counting is performed on each unique group of all values in the selected columns.
- The first column of the resulting query will be the count of unique values in the selected column(s) and will be followed by each value.