Merge branch 'master' of github.com:coreos-inc/quay
This commit is contained in:
		
						commit
						f5138792ad
					
				
					 7 changed files with 78 additions and 15 deletions
				
			
		|  | @ -67,6 +67,7 @@ class SendToCloudWatch(Thread): | |||
| class QueueMetrics(object): | ||||
|   def __init__(self, app=None): | ||||
|     self.app = app | ||||
|     self.sender = None | ||||
|     if app is not None: | ||||
|       self.state = self.init_app(app) | ||||
|     else: | ||||
|  | @ -85,8 +86,7 @@ class QueueMetrics(object): | |||
|       request_queue = Queue() | ||||
|       reporter = QueueingCloudWatchReporter(request_queue, namespace, req_capacity_name, | ||||
|                                             build_percent_name) | ||||
|       sender = SendToCloudWatch(request_queue, access_key, secret_key) | ||||
|       sender.start() | ||||
|       self.sender = SendToCloudWatch(request_queue, access_key, secret_key) | ||||
|     else: | ||||
|       reporter = NullReporter() | ||||
| 
 | ||||
|  | @ -95,5 +95,11 @@ class QueueMetrics(object): | |||
|     app.extensions['queuemetrics'] = reporter | ||||
|     return reporter | ||||
| 
 | ||||
|   def run(self): | ||||
|     logger.debug('Asked to start CloudWatch reporter') | ||||
|     if self.sender is not None: | ||||
|       logger.debug('Starting CloudWatch reporter') | ||||
|       self.sender.start() | ||||
| 
 | ||||
|   def __getattr__(self, name): | ||||
|     return getattr(self.state, name, None) | ||||
|  |  | |||
		Reference in a new issue