Merge lp:~cprov/core-image-publisher/bump-uservice into lp:core-image-publisher

Proposed by Celso Providelo on 2015-04-03
Status: Merged
Approved by: Celso Providelo on 2015-04-03
Approved revision: 27
Merged at revision: 25
Proposed branch: lp:~cprov/core-image-publisher/bump-uservice
Merge into: lp:core-image-publisher
Diff against target: 43 lines (+9/-2)
2 files modified
core_image_publisher/__init__.py (+8/-1)
requirements.txt (+1/-1)
To merge this branch: bzr merge lp:~cprov/core-image-publisher/bump-uservice
Reviewer Review Type Date Requested Status
Celso Providelo (community) Approve on 2015-04-03
Review via email: mp+255162@code.launchpad.net

Commit message

Upgrading uservices-utils dependency to 1.0.2.1 to benefit of working logstash support.

Description of the change

Upgrading uservices-utils dependency to 1.0.2.1 to benefit of working logstash support.

Also ensure the service logs a watermarked message on start ('Started!') so we can monitor if it is dying unexpectedly.

Project pip-cache already include the new package version.

To post a comment you must log in.
27. By Celso Providelo on 2015-04-03

Fix testing issue.

Celso Providelo (cprov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'core_image_publisher/__init__.py'
2--- core_image_publisher/__init__.py 2015-04-01 21:15:15 +0000
3+++ core_image_publisher/__init__.py 2015-04-03 02:06:20 +0000
4@@ -17,6 +17,7 @@
5
6 import argparse
7 import configparser
8+import logging
9 import os
10
11 from uservice_utils.logging import configure_service_logging
12@@ -26,7 +27,10 @@
13 CoreImagePublisherQueueMonitor,
14 CoreImageResultPublisher,
15 )
16-from core_image_publisher import worker
17+from core_image_publisher import (
18+ constants,
19+ worker,
20+)
21
22
23 def read_config():
24@@ -54,6 +58,9 @@
25 log_path,
26 config['logstash'] if 'logstash' in config else None
27 )
28+ logger = logging.getLogger(__name__)
29+ logger.info('Started!', extra=constants.LOGGING_EXTRA)
30+
31 connection = create_connection_from_config(config)
32 try:
33 with connection:
34
35=== modified file 'requirements.txt'
36--- requirements.txt 2015-04-02 04:37:48 +0000
37+++ requirements.txt 2015-04-03 02:06:20 +0000
38@@ -7,4 +7,4 @@
39 kombu==3.0.24
40 python-logstash==0.4.2
41 python-glanceclient==0.17.0
42-uservice-utils==1.0.1
43+uservice-utils==1.0.2.1

Subscribers

People subscribed via source and target branches