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

[Celso Providelo]

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

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.

[Celso Providelo (cprov)]

review: Approve

[Ubuntu CI Bot (uci-bot)]

The attempt to merge lp:~cprov/core-image-watcher/bump-uservice into lp:core-image-watcher failed. Below is the output from the failed tests.

Using base prefix '/usr'
New python executable in /tmp/venv-core-image-watcherdkd9ek2u/bin/python3
Also creating executable in /tmp/venv-core-image-watcherdkd9ek2u/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python3
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking kombu==3.0.24 (from -r requirements.txt (line 1))
Downloading/unpacking python-logstash==0.4.2 (from -r requirements.txt (line 2))
  Running setup.py (path:/tmp/venv-core-image-watcherdkd9ek2u/build/python-logstash/setup.py) egg_info for package python-logstash

Downloading/unpacking uservice-utils==1.0.2.1 (from -r requirements.txt (line 3))
Downloading/unpacking amqp>=1.4.5,<2.0 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-core-image-watcherdkd9ek2u/build/amqp/setup.py) egg_info for package amqp

Downloading/unpacking anyjson>=0.3.3 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-core-image-watcherdkd9ek2u/build/anyjson/setup.py) egg_info for package anyjson

Installing collected packages: kombu, python-logstash, uservice-utils, amqp, anyjson
  Running setup.py install for python-logstash

  Running setup.py install for amqp

  Running setup.py install for anyjson
    Fixing build/lib/anyjson/__init__.py
    Skipping implicit fixer: buffer
    Skipping implicit fixer: idioms
    Skipping implicit fixer: set_literal
    Skipping implicit fixer: ws_comma
    Fixing build/lib/anyjson/__init__.py
    Skipping implicit fixer: buffer
    Skipping implicit fixer: idioms
    Skipping implicit fixer: set_literal
    Skipping implicit fixer: ws_comma

Successfully installed kombu python-logstash uservice-utils amqp anyjson
Cleaning up...
Downloading/unpacking testtools==1.7.1 (from -r test_requirements.txt (line 1))
Downloading/unpacking flake8==2.4.0 (from -r test_requirements.txt (line 2))
  Downloading flake8-2.4.0-py2.py3-none-any.whl
Downloading/unpacking unittest2>=1.0.0 (from testtools==1.7.1->-r test_requirements.txt (line 1))
Downloading/unpacking traceback2 (from testtools==1.7.1->-r test_requirements.txt (line 1))
  Downloading traceback2-1.4.0-py2.py3-none-any.whl
Downloading/unpacking extras (from testtools==1.7.1->-r test_requirements.txt (line 1))
  Downloading extras-0.0.3.tar.gz
  Running setup.py (path:/tmp/venv-core-image-watcherdkd9ek2u/build/extras/setup.py) egg_info for package extras

Downloading/unpacking python-mimeparse (from testtools==1.7.1->-r test_requirements.txt (line 1))
  Downloading python-mimeparse-0.1.4.tar.gz
  Running setup.py (path:/tmp/venv-core-image-watcherdkd9ek2u/build/python-mimeparse/setup.py) egg_info for package python-mimeparse

Downloading/unpacking pyflakes>=0.8.1,<0.9 (from flake8==2.4.0->-r test_requirements.txt (line 2))
  Downloading pyflakes-0.8.1-py2.py3-none-any.whl
Downloading/unpacking pep8>=1.5.7,<1.6 (from flake8==2.4.0->-r test_requirements.txt (line 2))
  Downloading pep8-1.5.7-py2.py3-none-any.whl
Downloadin...

[lp:~cprov/core-image-watcher/bump-uservice]

17. By Celso Providelo on 2015-04-03

Fix testing issue.

=== modified file 'core_image_watcher/__init__.py'
--- core_image_watcher/__init__.py	2015-04-01 21:26:45 +0000
+++ core_image_watcher/__init__.py	2015-04-03 02:05:24 +0000
@@ -150,6 +150,8 @@
         config['logstash'] if 'logstash' in config else None
     )
 
+    logger.info('Started!', extra=logging_extra)
+
     amqp_uris = config.get('amqp', 'uris').split()
     location = config.get('image', 'location')
     channel = config.get('image', 'channel')

=== modified file 'requirements.txt'
--- requirements.txt	2015-04-02 04:41:41 +0000
+++ requirements.txt	2015-04-03 02:05:24 +0000
@@ -1,3 +1,3 @@
 kombu==3.0.24
 python-logstash==0.4.2
-uservice_utils==1.0.1
+uservice_utils==1.0.2.1