1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/c494ee616c1a/
Changeset: c494ee616c1a
User: dannon
Date: 2015-02-06 16:40:47+00:00
Summary: Relocate uwsgi test to the beginning of config, since this might affect other config options down the road.
Affected #: 1 file
diff -r 015395841d805061261913e92d408121766e470b -r c494ee616c1aafa755e4d80b893697623e4431bb lib/galaxy/config.py
--- a/lib/galaxy/config.py
+++ b/lib/galaxy/config.py
@@ -50,6 +50,19 @@
os.umask( self.umask ) # can't get w/o set, so set it back
self.gid = os.getgid() # if running under newgrp(1) we'll need to fix the group of data created on the cluster
+ # TEST FOR UWSGI
+ self.is_uwsgi = False
+ try:
+ # The uwsgi module is automatically injected by the parent uwsgi
+ # process and only exists that way. If anything works, this is a
+ # uwsgi-managed process.
+ import uwsgi
+ if uwsgi.numproc:
+ self.is_uwsgi = True
+ except ImportError:
+ # This is not a uwsgi process, or something went horribly wrong.
+ pass
+
# Database related configuration
self.database = resolve_path( kwargs.get( "database_file", "database/universe.sqlite" ), self.root )
self.database_connection = kwargs.get( "database_connection", False )
@@ -428,18 +441,6 @@
self.citation_cache_type = kwargs.get( "citation_cache_type", "file" )
self.citation_cache_data_dir = self.resolve_path( kwargs.get( "citation_cache_data_dir", "database/citations/data" ) )
self.citation_cache_lock_dir = self.resolve_path( kwargs.get( "citation_cache_lock_dir", "database/citations/locks" ) )
- # TEST FOR UWSGI
- self.is_uwsgi = False
- try:
- # The uwsgi module is automatically injected by the parent uwsgi
- # process and only exists that way. If anything works, this is a
- # uwsgi-managed process.
- import uwsgi
- if uwsgi.numproc:
- self.is_uwsgi = True
- except ImportError:
- # This is not a uwsgi process, or something went horribly wrong.
- pass
@property
def sentry_dsn_public( 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/commits/32e4527bab2d/
Changeset: 32e4527bab2d
Branch: stable
User: natefoo
Date: 2015-02-06 14:00:23+00:00
Summary: Update tag latest_2015.01.13 for changeset 644deef1a578
Affected #: 1 file
diff -r 644deef1a5789b788552a6db7f3d6fe07d81c79d -r 32e4527bab2d79f0797c28500a379b6b6c7a3900 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -22,4 +22,4 @@
2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06
782fa60fc65488aea0c618d723e9a63d42caf865 latest_2014.10.06
2e8dd2949dd3eee0f56f9a3a5ebf1b2baca24aee release_2015.01.13
-5e4060f5ac7a3c11d4681bc80f94c620df9d0479 latest_2015.01.13
+644deef1a5789b788552a6db7f3d6fe07d81c79d latest_2015.01.13
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/commits/be4958cce4aa/
Changeset: be4958cce4aa
User: dannon
Date: 2015-02-06 14:00:12+00:00
Summary: The other half of d89864b9f5daaec89dfda0ad5772a13aed72536b.
Affected #: 1 file
diff -r afc4ac302c006c0d27c04d746373fd2da05d169f -r be4958cce4aac391972fd635a424954789b0c36b lib/galaxy/app.py
--- a/lib/galaxy/app.py
+++ b/lib/galaxy/app.py
@@ -143,11 +143,6 @@
self.workflow_scheduling_manager = scheduling_manager.WorkflowSchedulingManager( self )
self.model.engine.dispose()
- self.control_worker = GalaxyQueueWorker(self,
- galaxy.queues.control_queue_from_config(self.config),
- galaxy.queue_worker.control_message_to_task)
- self.control_worker.daemon = True
- self.control_worker.start()
def shutdown( self ):
self.workflow_scheduling_manager.shutdown()
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.