1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/91556bfa4f33/
changeset: 91556bfa4f33
user: natefoo
date: 2012-02-17 17:27:29
summary: Make the job queue thread block on job recovery to avoid a race condition with jobs in the 'new' state. This should fix jobs showing up as 'ok' and then upon a later history reload showing up as 'error'.
affected #: 1 file
diff -r 07a458a0213901fdd220db8ee2dc111cedc55028 -r 91556bfa4f336dbdf656f244f82b3894a5e429e8 lib/galaxy/jobs/__init__.py
--- a/lib/galaxy/jobs/__init__.py
+++ b/lib/galaxy/jobs/__init__.py
@@ -96,10 +96,12 @@
self.running = True
self.dispatcher = dispatcher
self.monitor_thread = threading.Thread( target=self.__monitor )
+ # Recover jobs at startup
+ if app.config.get_bool( 'enable_job_recovery', True ):
+ self.__check_jobs_at_startup()
+ # Start the queue
self.monitor_thread.start()
log.info( "job manager started" )
- if app.config.get_bool( 'enable_job_recovery', True ):
- self.__check_jobs_at_startup()
def __check_jobs_at_startup( self ):
"""
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/07a458a02139/
changeset: 07a458a02139
user: dan
date: 2012-02-17 16:04:28
summary: Add tool-data/shared/rviewer/rviewer_build_sites.txt.sample to run.sh sample list.
affected #: 1 file
diff -r dc6fc958766f825d9aff62cc530231858480937c -r 07a458a0213901fdd220db8ee2dc111cedc55028 run.sh
--- a/run.sh
+++ b/run.sh
@@ -16,6 +16,7 @@
universe_wsgi.ini.sample
tool-data/shared/ucsc/builds.txt.sample
tool-data/shared/igv/igv_build_sites.txt.sample
+ tool-data/shared/rviewer/rviewer_build_sites.txt.sample
tool-data/*.sample
static/welcome.html.sample
"
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/a1a7bc41df01/
changeset: a1a7bc41df01
user: jgoecks
date: 2012-02-16 20:05:03
summary: Fix initialization of tags and annotations in history datasets.
affected #: 1 file
diff -r 5ac62b79d6926ad0a9db8810dedf9fe1a1ed41fa -r a1a7bc41df0102598ba1a459307b23b319adc018 templates/root/history.mako
--- a/templates/root/history.mako
+++ b/templates/root/history.mako
@@ -228,8 +228,8 @@
$(this).find("a.show-details").bind("click", function() { return false; });
*/
- tag_handling(document);
- annotation_handling(document);
+ tag_handling(this);
+ annotation_handling(this);
});
// Trackster links
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.